aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2010-07-04 15:51:05 +0200
committerJuanma Barranquero2010-07-04 15:51:05 +0200
commitb8ce688b115129f49bf5b9fbedf8406512fd231c (patch)
tree5cc94adf860236dae59d0204fe2c15d943c8c879
parente5447b22e975b57094fb6089bf98a238d29fd710 (diff)
downloademacs-b8ce688b115129f49bf5b9fbedf8406512fd231c.tar.gz
emacs-b8ce688b115129f49bf5b9fbedf8406512fd231c.zip
Fix comments and whitespace.
-rw-r--r--src/data.c4
-rw-r--r--src/doc.c4
-rw-r--r--src/editfns.c8
-rw-r--r--src/keymap.c4
-rw-r--r--src/lread.c4
5 files changed, 7 insertions, 17 deletions
diff --git a/src/data.c b/src/data.c
index 156c900933f..f92bc796480 100644
--- a/src/data.c
+++ b/src/data.c
@@ -941,10 +941,6 @@ do_symval_forwarding (register union Lisp_Fwd *valcontents)
941 941
942static void 942static void
943store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newval, struct buffer *buf) 943store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newval, struct buffer *buf)
944 /* struct Lisp_Symbol *symbol; */
945
946
947
948{ 944{
949 switch (XFWDTYPE (valcontents)) 945 switch (XFWDTYPE (valcontents))
950 { 946 {
diff --git a/src/doc.c b/src/doc.c
index d9d79ee4072..57e1bc8f0e6 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -511,9 +511,7 @@ aren't strings. */)
511 511
512static void 512static void
513store_function_docstring (Lisp_Object fun, EMACS_INT offset) 513store_function_docstring (Lisp_Object fun, EMACS_INT offset)
514 514/* Use EMACS_INT because we get offset from pointer subtraction. */
515 /* Use EMACS_INT because we get this from pointer subtraction. */
516
517{ 515{
518 fun = indirect_function (fun); 516 fun = indirect_function (fun);
519 517
diff --git a/src/editfns.c b/src/editfns.c
index f318705d2cd..5b340644fa8 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1436,7 +1436,7 @@ get_system_name (void)
1436} 1436}
1437 1437
1438char * 1438char *
1439get_operating_system_release(void) 1439get_operating_system_release (void)
1440{ 1440{
1441 if (STRINGP (Voperating_system_release)) 1441 if (STRINGP (Voperating_system_release))
1442 return (char *) SDATA (Voperating_system_release); 1442 return (char *) SDATA (Voperating_system_release);
@@ -3592,7 +3592,7 @@ usage: (format STRING &rest OBJECTS) */)
3592 string itself, will not be used. Element NARGS, corresponding to 3592 string itself, will not be used. Element NARGS, corresponding to
3593 no argument, *will* be assigned to in the case that a `%' and `.' 3593 no argument, *will* be assigned to in the case that a `%' and `.'
3594 occur after the final format specifier. */ 3594 occur after the final format specifier. */
3595 int *precision = (int *) (alloca((nargs + 1) * sizeof (int))); 3595 int *precision = (int *) (alloca ((nargs + 1) * sizeof (int)));
3596 int longest_format; 3596 int longest_format;
3597 Lisp_Object val; 3597 Lisp_Object val;
3598 int arg_intervals = 0; 3598 int arg_intervals = 0;
@@ -3763,7 +3763,7 @@ usage: (format STRING &rest OBJECTS) */)
3763 string will finally appear (Bug#5710). */ 3763 string will finally appear (Bug#5710). */
3764 actual_width = lisp_string_width (args[n], -1, NULL, NULL); 3764 actual_width = lisp_string_width (args[n], -1, NULL, NULL);
3765 if (precision[n] != -1) 3765 if (precision[n] != -1)
3766 actual_width = min(actual_width,precision[n]); 3766 actual_width = min (actual_width, precision[n]);
3767 } 3767 }
3768 /* Would get MPV otherwise, since Lisp_Int's `point' to low memory. */ 3768 /* Would get MPV otherwise, since Lisp_Int's `point' to low memory. */
3769 else if (INTEGERP (args[n]) && *format != 's') 3769 else if (INTEGERP (args[n]) && *format != 's')
@@ -3876,7 +3876,7 @@ usage: (format STRING &rest OBJECTS) */)
3876 discarded[format - format_start] = 1; 3876 discarded[format - format_start] = 1;
3877 format++; 3877 format++;
3878 3878
3879 while (index("-+0# ", *format)) 3879 while (index ("-+0# ", *format))
3880 { 3880 {
3881 if (*format == '-') 3881 if (*format == '-')
3882 { 3882 {
diff --git a/src/keymap.c b/src/keymap.c
index a0f1c63c14a..c896e6ceb96 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2088,9 +2088,7 @@ struct accessible_keymaps_data {
2088 2088
2089static void 2089static void
2090accessible_keymaps_1 (Lisp_Object key, Lisp_Object cmd, Lisp_Object args, void *data) 2090accessible_keymaps_1 (Lisp_Object key, Lisp_Object cmd, Lisp_Object args, void *data)
2091 2091/* Use void* data to be compatible with map_keymap_function_t. */
2092 /* Use void* to be compatible with map_keymap_function_t. */
2093
2094{ 2092{
2095 struct accessible_keymaps_data *d = data; /* Cast! */ 2093 struct accessible_keymaps_data *d = data; /* Cast! */
2096 Lisp_Object maps = d->maps; 2094 Lisp_Object maps = d->maps;
diff --git a/src/lread.c b/src/lread.c
index 5e0d2d8c772..6962485eabd 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1899,9 +1899,7 @@ START and END optionally delimit a substring of STRING from which to read;
1899 calls. */ 1899 calls. */
1900static Lisp_Object 1900static Lisp_Object
1901read_internal_start (Lisp_Object stream, Lisp_Object start, Lisp_Object end) 1901read_internal_start (Lisp_Object stream, Lisp_Object start, Lisp_Object end)
1902 1902/* start, end only used when stream is a string. */
1903 /* Only used when stream is a string. */
1904 /* Only used when stream is a string. */
1905{ 1903{
1906 Lisp_Object retval; 1904 Lisp_Object retval;
1907 1905