aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Levitt2010-08-12 10:55:20 +0200
committerStefan Monnier2010-08-12 10:55:20 +0200
commit61b6abbdb48cf42646f8ea7894511e40ae1cab74 (patch)
tree42ea85c6f173911b55e0c423b9e5dedb12a989aa
parent94dff98f390e81caedf9a79949c89f4c6e9ca56c (diff)
downloademacs-61b6abbdb48cf42646f8ea7894511e40ae1cab74.tar.gz
emacs-61b6abbdb48cf42646f8ea7894511e40ae1cab74.zip
* lisp/cus-edit.el (custom-save-variables, custom-save-faces): Fix up
indentation of inserted comment.
-rw-r--r--lisp/ChangeLog12
-rw-r--r--lisp/cus-edit.el16
2 files changed, 16 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 763ffd0dd0f..02b380e1bb2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-08-12 Antoine Levitt <antoine.levitt@gmail.com> (tiny change)
2
3 * cus-edit.el (custom-save-variables, custom-save-faces): Fix up
4 indentation of inserted comment.
5
12010-08-11 Jan Djärv <jan.h.d@swipnet.se> 62010-08-11 Jan Djärv <jan.h.d@swipnet.se>
2 7
3 * faces.el (region): Add type gtk that uses gtk colors. 8 * faces.el (region): Add type gtk that uses gtk colors.
@@ -11,8 +16,8 @@
11 (sql-product-alist): Add :prompt-cont-regexp property for several 16 (sql-product-alist): Add :prompt-cont-regexp property for several
12 database products. 17 database products.
13 (sql-prompt-cont-regexp): New variable. 18 (sql-prompt-cont-regexp): New variable.
14 (sql-output-newline-count, sql-output-by-send): New 19 (sql-output-newline-count, sql-output-by-send):
15 variables. Record number of newlines in input text. 20 New variables. Record number of newlines in input text.
16 (sql-send-string): Handle multiple filters and count newlines. 21 (sql-send-string): Handle multiple filters and count newlines.
17 (sql-send-magic-terminator): Count terminator newline. 22 (sql-send-magic-terminator): Count terminator newline.
18 (sql-interactive-remove-continuation-prompt): Filters output to 23 (sql-interactive-remove-continuation-prompt): Filters output to
@@ -20,8 +25,7 @@
20 (sql-interactive-mode): Set up new variables, prompt regexp and 25 (sql-interactive-mode): Set up new variables, prompt regexp and
21 output filter. 26 output filter.
22 (sql-mode-sqlite-font-lock-keywords): Correct some keywords. 27 (sql-mode-sqlite-font-lock-keywords): Correct some keywords.
23 (sql-make-alternate-buffer-name): Correct buffer name in edge 28 (sql-make-alternate-buffer-name): Correct buffer name in edge cases.
24 cases.
25 29
262010-08-10 Stefan Monnier <monnier@iro.umontreal.ca> 302010-08-10 Stefan Monnier <monnier@iro.umontreal.ca>
27 31
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index bb2f67422e3..9fa817bd102 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -4404,10 +4404,10 @@ This function does not save the buffer."
4404 (unless (bolp) 4404 (unless (bolp)
4405 (princ "\n")) 4405 (princ "\n"))
4406 (princ "(custom-set-variables 4406 (princ "(custom-set-variables
4407 ;; custom-set-variables was added by Custom. 4407 ;; custom-set-variables was added by Custom.
4408 ;; If you edit it by hand, you could mess it up, so be careful. 4408 ;; If you edit it by hand, you could mess it up, so be careful.
4409 ;; Your init file should contain only one such instance. 4409 ;; Your init file should contain only one such instance.
4410 ;; If there is more than one, they won't work right.\n") 4410 ;; If there is more than one, they won't work right.\n")
4411 (dolist (symbol saved-list) 4411 (dolist (symbol saved-list)
4412 (let ((spec (car-safe (get symbol 'theme-value))) 4412 (let ((spec (car-safe (get symbol 'theme-value)))
4413 (value (get symbol 'saved-value)) 4413 (value (get symbol 'saved-value))
@@ -4480,10 +4480,10 @@ This function does not save the buffer."
4480 (unless (bolp) 4480 (unless (bolp)
4481 (princ "\n")) 4481 (princ "\n"))
4482 (princ "(custom-set-faces 4482 (princ "(custom-set-faces
4483 ;; custom-set-faces was added by Custom. 4483 ;; custom-set-faces was added by Custom.
4484 ;; If you edit it by hand, you could mess it up, so be careful. 4484 ;; If you edit it by hand, you could mess it up, so be careful.
4485 ;; Your init file should contain only one such instance. 4485 ;; Your init file should contain only one such instance.
4486 ;; If there is more than one, they won't work right.\n") 4486 ;; If there is more than one, they won't work right.\n")
4487 (dolist (symbol saved-list) 4487 (dolist (symbol saved-list)
4488 (let ((spec (car-safe (get symbol 'theme-face))) 4488 (let ((spec (car-safe (get symbol 'theme-face)))
4489 (value (get symbol 'saved-face)) 4489 (value (get symbol 'saved-face))