diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/cc-vars.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 330ea0a3298..dcd12fcafbb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-11-25 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * progmodes/cc-vars.el (c-backslash-column): Mention | ||
| 4 | c-backslash-max-column in documentation for c-backslash-column. | ||
| 5 | |||
| 1 | 2006-11-24 Lars Hansen <larsh@soem.dk> | 6 | 2006-11-24 Lars Hansen <larsh@soem.dk> |
| 2 | 7 | ||
| 3 | * net/tramp.el (tramp-default-method): Under Windows, change from | 8 | * net/tramp.el (tramp-default-method): Under Windows, change from |
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 0e6738710c5..23ae63f0c52 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el | |||
| @@ -809,7 +809,7 @@ then no newline is inserted." | |||
| 809 | This is used by the functions that automatically insert or align the | 809 | This is used by the functions that automatically insert or align the |
| 810 | line continuation backslashes in multiline macros. If any line in the | 810 | line continuation backslashes in multiline macros. If any line in the |
| 811 | macro exceeds this column then the next tab stop from that line is | 811 | macro exceeds this column then the next tab stop from that line is |
| 812 | used as alignment column instead." | 812 | used as alignment column instead. See also `c-backslash-max-column'" |
| 813 | :type 'integer | 813 | :type 'integer |
| 814 | :group 'c) | 814 | :group 'c) |
| 815 | ;;;###autoload(put 'c-backslash-column 'safe-local-variable 'integerp) | 815 | ;;;###autoload(put 'c-backslash-column 'safe-local-variable 'integerp) |