From 1fcf76afe76188b1f555f3e9b619fee70907d4c8 Mon Sep 17 00:00:00 2001 From: Geoff Gole Date: Sun, 8 Aug 2010 22:23:35 -0400 Subject: * whitespace.el (whitespace-color-off): Remove post-command-hook locally. --- lisp/ChangeLog | 5 +++++ lisp/whitespace.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3a37cf2dfb4..0bdb6535045 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-08-09 Geoff Gole (tiny change) + + * whitespace.el (whitespace-color-off): Remove post-command-hook + locally. + 2010-08-08 Johan Bockgård * replace.el (replace-highlight): Bind isearch-forward and diff --git a/lisp/whitespace.el b/lisp/whitespace.el index 183698a28f3..5c7d4e95caf 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -2297,7 +2297,7 @@ resultant list will be returned." ;; turn off font lock (when (whitespace-style-face-p) (font-lock-mode 0) - (remove-hook 'post-command-hook #'whitespace-post-command-hook) + (remove-hook 'post-command-hook #'whitespace-post-command-hook t) (when whitespace-font-lock (setq whitespace-font-lock nil font-lock-keywords whitespace-font-lock-keywords)) -- cgit v1.2.1 From 7467d0a812ca803105e6d28dbb75c7246521e862 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 11 Aug 2010 15:43:49 +0200 Subject: * subr.el (ignore-errors): Add debug declaration. --- lisp/ChangeLog | 4 ++++ lisp/subr.el | 1 + 2 files changed, 5 insertions(+) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0bdb6535045..0ae95366b6d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-08-11 Andreas Schwab + + * subr.el (ignore-errors): Add debug declaration. + 2010-08-09 Geoff Gole (tiny change) * whitespace.el (whitespace-color-off): Remove post-command-hook diff --git a/lisp/subr.el b/lisp/subr.el index 16ea5b41342..44ae84ab76b 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -219,6 +219,7 @@ Treated as a declaration when used at the right place in a (defmacro ignore-errors (&rest body) "Execute BODY; if an error occurs, return nil. Otherwise, return result of last form in BODY." + (declare (debug t) (indent 0)) `(condition-case nil (progn ,@body) (error nil))) ;;;; Basic Lisp functions. -- cgit v1.2.1 From 721dce172ba46f32208e7f0ddf5bfb326094e5a8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 13 Aug 2010 18:56:35 -0700 Subject: Minor diary-lib.el fix. * lisp/calendar/diary-lib.el (diary-header-line-format): Fit it to the window, not the frame. --- lisp/ChangeLog | 5 +++++ lisp/calendar/diary-lib.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0ae95366b6d..718f6f402e5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-08-14 Glenn Morris + + * calendar/diary-lib.el (diary-header-line-format): + Fit it to the window, not the frame. + 2010-08-11 Andreas Schwab * subr.el (ignore-errors): Add debug declaration. diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 8fb464aa7e6..fc416d869bb 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -383,7 +383,7 @@ The format of the header is specified by `diary-header-line-format'." "Some text is hidden - press \"s\" in calendar \ before edit/copy" "Diary")) - ?\s (frame-width))) + ?\s (window-width))) "Format of the header line displayed by `diary-simple-display'. Only used if `diary-header-line-flag' is non-nil." :group 'diary -- cgit v1.2.1 From ec1339fbce4df95a3ae96b7796a28dfe6186db4e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 13 Aug 2010 19:23:56 -0700 Subject: * lisp/calendar/diary-lib.el: Bump custom :version for previous change. --- lisp/calendar/diary-lib.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index fc416d869bb..39354bd31e3 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -390,7 +390,7 @@ Only used if `diary-header-line-flag' is non-nil." :type 'sexp :initialize 'custom-initialize-default :set 'diary-set-header - :version "22.1") + :version "23.3") ; frame-width -> window-width ;; The first version of this also checked for diary-selective-display ;; in the non-fancy case. This was an attempt to distinguish between -- cgit v1.2.1 From a4aae1a5322c264d5b9d2f605a4b31acec78e526 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 14 Aug 2010 19:21:40 -0400 Subject: * simple.el (kill-region): Doc fix (Bug#6787). --- lisp/ChangeLog | 4 ++++ lisp/simple.el | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 718f6f402e5..a0cdf2f8a77 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-08-14 Chong Yidong + + * simple.el (kill-region): Doc fix (Bug#6787). + 2010-08-14 Glenn Morris * calendar/diary-lib.el (diary-header-line-format): diff --git a/lisp/simple.el b/lisp/simple.el index d0c27656e41..9b38f3cdbf3 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2959,7 +2959,8 @@ If the buffer is read-only, Emacs will beep and refrain from deleting the text, but put the text in the kill ring anyway. This means that you can use the killing commands to copy text from a read-only buffer. -This is the primitive for programs to kill text (as opposed to deleting it). +Lisp programs should use this function for killing text. + (To delete text, use `delete-region'.) Supply two arguments, character positions indicating the stretch of text to be killed. Any command that calls this function is a \"kill command\". -- cgit v1.2.1 From bb25c8d7a1da7de1cb5d12a47e27be30879c4237 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 17 Aug 2010 19:33:13 -0700 Subject: * lisp/woman.el (woman-translate): Case matters. (Bug#6849) --- lisp/ChangeLog | 4 ++++ lisp/woman.el | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a0cdf2f8a77..8d74713da93 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-08-18 Glenn Morris + + * woman.el (woman-translate): Case matters. (Bug#6849) + 2010-08-14 Chong Yidong * simple.el (kill-region): Doc fix (Bug#6787). diff --git a/lisp/woman.el b/lisp/woman.el index 79d6d84aff1..eb21f01e564 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -3384,7 +3384,10 @@ Format paragraphs upto TO. Supports special chars. "Translate up to marker TO. Do this last of all transformations." (if translations (let ((matches (car translations)) - (alist (cdr translations))) + (alist (cdr translations)) + ;; Translations are case-sensitive, eg ".tr ab" does not + ;; affect "A" (bug#6849). + (case-fold-search nil)) (while (re-search-forward matches to t) ;; Done like this to retain text properties and ;; support translation of special characters: -- cgit v1.2.1 From f3cc64f80843f278814b69bd0a8b2642d31dda77 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Wed, 18 Aug 2010 17:07:58 +0900 Subject: files.el: Add word-wrap as safe local variable. --- lisp/ChangeLog | 4 ++++ lisp/files.el | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8d74713da93..7f31ac6a673 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-08-18 Kenichi Handa + + * files.el: Add `word-wrap' as safe local variable. + 2010-08-18 Glenn Morris * woman.el (woman-translate): Case matters. (Bug#6849) diff --git a/lisp/files.el b/lisp/files.el index 4c819972555..f6564768ae7 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2774,7 +2774,8 @@ asking you for confirmation." (left-margin . integerp) ;; C source code (no-update-autoloads . booleanp) (tab-width . integerp) ;; C source code - (truncate-lines . booleanp))) ;; C source code + (truncate-lines . booleanp) ;; C source code + (word-wrap . booleanp))) ;; C source code (put 'c-set-style 'safe-local-eval-function t) -- cgit v1.2.1 From a67e6f13345ce7307ada22a8226da192f47299ac Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 18 Aug 2010 20:24:52 +0200 Subject: * progmodes/flymake.el (flymake-start-syntax-check-process): Use `start-file-process' in order to let it run also on remote hosts. --- lisp/ChangeLog | 6 ++++++ lisp/progmodes/flymake.el | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7f31ac6a673..45c5fd52d99 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-08-18 Michael Albinus + + * progmodes/flymake.el (flymake-start-syntax-check-process): Use + `start-file-process' in order to let it run also on remote hosts. + 2010-08-18 Kenichi Handa * files.el: Add `word-wrap' as safe local variable. @@ -68,6 +73,7 @@ (ctext-no-compositions): Doc fix. (compound-text-with-extensions): Doc fix. +>>>>>>> MERGE-SOURCE 2010-08-04 Stefan Monnier * simple.el (exchange-dot-and-mark): Mark obsolete, finally. diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index 2a198215536..712af6fd288 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el @@ -1152,7 +1152,8 @@ For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'." (when dir (let ((default-directory dir)) (flymake-log 3 "starting process on dir %s" default-directory))) - (setq process (apply 'start-process "flymake-proc" (current-buffer) cmd args)) + (setq process (apply 'start-file-process + "flymake-proc" (current-buffer) cmd args)) (set-process-sentinel process 'flymake-process-sentinel) (set-process-filter process 'flymake-process-filter) (push process flymake-processes) -- cgit v1.2.1 From 9b3d6a42efd17fb2a9f01b128b10b17da5296c98 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 19 Aug 2010 01:32:39 +0200 Subject: lisp/ChangeLog: Remove merge markers. --- lisp/ChangeLog | 1 - 1 file changed, 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 45c5fd52d99..578f5e4fb49 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -73,7 +73,6 @@ (ctext-no-compositions): Doc fix. (compound-text-with-extensions): Doc fix. ->>>>>>> MERGE-SOURCE 2010-08-04 Stefan Monnier * simple.el (exchange-dot-and-mark): Mark obsolete, finally. -- cgit v1.2.1 From 186e86dbac28ca3bd9aa23cb6c8123f2b5ff919a Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 19 Aug 2010 16:37:31 +0200 Subject: * lisp/subr.el (read-key): Don't hide the menu-bar entries. Fixes: debbugs:6881 --- lisp/ChangeLog | 20 +++++++++++--------- lisp/subr.el | 7 ++++++- 2 files changed, 17 insertions(+), 10 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 578f5e4fb49..83578620420 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,11 @@ +2010-08-19 Stefan Monnier + + * subr.el (read-key): Don't hide the menu-bar entries (bug#6881). + 2010-08-18 Michael Albinus - * progmodes/flymake.el (flymake-start-syntax-check-process): Use - `start-file-process' in order to let it run also on remote hosts. + * progmodes/flymake.el (flymake-start-syntax-check-process): + Use `start-file-process' in order to let it run also on remote hosts. 2010-08-18 Kenichi Handa @@ -41,10 +45,8 @@ 2010-08-06 Kenichi Handa - * international/mule.el (define-charset): Store NAME as :base - property. - (ctext-non-standard-encodings-table): Pay attention to charset - aliases. + * international/mule.el (define-charset): Store NAME as :base property. + (ctext-non-standard-encodings-table): Pay attention to charset aliases. (ctext-pre-write-conversion): Sort ctext-standard-encodings by the current priority. Force using the designation of the specific charset by adding `charset' text property. Improve the whole @@ -61,12 +63,12 @@ * language/cyrillic.el: Don't add "microsoft-cp1251" to ctext-non-standard-encodings-alist here. - * international/mule.el (ctext-non-standard-encodings-alist): Add - "koi8-r" and "microsoft-cp1251". + * international/mule.el (ctext-non-standard-encodings-alist): + Add "koi8-r" and "microsoft-cp1251". (ctext-standard-encodings): New variable. (ctext-non-standard-encodings-table): List only elements for non-standard encodings. - (ctext-pre-write-conversion): Adjusted for the above change. + (ctext-pre-write-conversion): Adjust for the above change. Check ctext-standard-encodings. * international/mule-conf.el (compound-text): Doc fix. diff --git a/lisp/subr.el b/lisp/subr.el index 44ae84ab76b..ad939dc6bb4 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1842,7 +1842,12 @@ some sort of escape sequence, the ambiguity is resolved via `read-key-delay'." (throw 'read-key keys))))))) (unwind-protect (progn - (use-global-map read-key-empty-map) + (use-global-map + (let ((map (make-sparse-keymap))) + ;; Don't hide the menu-bar and tool-bar entries. + (define-key map [menu-bar] (lookup-key global-map [menu-bar])) + (define-key map [tool-bar] (lookup-key global-map [tool-bar])) + map)) (aref (catch 'read-key (read-key-sequence-vector prompt nil t)) 0)) (cancel-timer timer) (use-global-map old-global-map)))) -- cgit v1.2.1 From fb89a65490016bfb747b80a6967dc619944ef945 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 20 Aug 2010 00:11:35 -0700 Subject: Fix rmail-forward with non-sendmail sending function. * lisp/mail/rmail.el (rmail-forward): Replace mail-text-start with its expansion, so as not to need sendmail. (mail-text-start): Remove declaration. (rmail-retry-failure): Require sendmail. --- lisp/ChangeLog | 7 +++++++ lisp/mail/rmail.el | 13 ++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 83578620420..c104d38cdfd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2010-08-20 Glenn Morris + + * mail/rmail.el (rmail-forward): Replace mail-text-start with its + expansion, so as not to need sendmail. + (mail-text-start): Remove declaration. + (rmail-retry-failure): Require sendmail. + 2010-08-19 Stefan Monnier * subr.el (read-key): Don't hide the menu-bar entries (bug#6881). diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index fbf5c534a28..fa0b7bef207 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -191,8 +191,6 @@ please report it with \\[report-emacs-bug].") :group 'rmail-retrieve :type '(repeat (directory))) -(declare-function mail-position-on-field "sendmail" (field &optional soft)) -(declare-function mail-text-start "sendmail" ()) (declare-function rmail-dont-reply-to "mail-utils" (destinations)) (declare-function rmail-update-summary "rmailsum" (&rest ignore)) @@ -1643,8 +1641,6 @@ The duplicate copy goes into the Rmail file just after the original." (declare-function rmail-summary-mark-deleted "rmailsum" (&optional n undel)) (declare-function rfc822-addresses "rfc822" (header-text)) (declare-function mail-abbrev-make-syntax-table "mailabbrev.el" ()) -(declare-function mail-sendmail-delimit-header "sendmail" ()) -(declare-function mail-header-end "sendmail" ()) ;; RLK feature not added in this version: ;; argument specifies inbox file or files in various ways. @@ -3686,7 +3682,8 @@ see the documentation of `rmail-resend'." ;; The mail buffer is now current. (save-excursion ;; Insert after header separator--before signature if any. - (goto-char (mail-text-start)) + (rfc822-goto-eoh) + (forward-line 1) (if (or rmail-enable-mime rmail-enable-mime-composing) (funcall rmail-insert-mime-forwarded-message-function forward-buffer) @@ -3841,6 +3838,10 @@ The message should be narrowed to just the headers." (1- (point)) (point-max))))))) +(declare-function mail-sendmail-delimit-header "sendmail" ()) +(declare-function mail-header-end "sendmail" ()) +(declare-function mail-position-on-field "sendmail" (field &optional soft)) + (defun rmail-retry-failure () "Edit a mail message which is based on the contents of the current message. For a message rejected by the mail system, extract the interesting headers and @@ -3932,6 +3933,8 @@ specifying headers which should not be copied into the new message." (goto-char (point-min)) (if bounce-indent (indent-rigidly (point-min) (point-max) bounce-indent)) + ;; FIXME better to replace sendmail functions. + (require 'sendmail) (mail-sendmail-delimit-header) (save-restriction (narrow-to-region (point-min) (mail-header-end)) -- cgit v1.2.1 From 9130a2d65e43df830bc987b519b46904bf111334 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 20 Aug 2010 00:33:06 -0700 Subject: Minor align-regexp fix. * lisp/align.el (align-regexp): Make group and spacing arguments use the interactive defaults when non-interactive. (Bug#6698) --- lisp/ChangeLog | 3 +++ lisp/align.el | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c104d38cdfd..0b9731ae904 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2010-08-20 Glenn Morris + * align.el (align-regexp): Make group and spacing arguments + use the interactive defaults when non-interactive. (Bug#6698) + * mail/rmail.el (rmail-forward): Replace mail-text-start with its expansion, so as not to need sendmail. (mail-text-start): Remove declaration. diff --git a/lisp/align.el b/lisp/align.el index 9d811327021..0812d362875 100644 --- a/lisp/align.el +++ b/lisp/align.el @@ -1,7 +1,7 @@ ;;; align.el --- align text to a specific column, by regexp -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: John Wiegley ;; Maintainer: FSF @@ -944,6 +944,8 @@ region, call `align-regexp' and type in that regular expression." (list (concat "\\(\\s-*\\)" (read-string "Align regexp: ")) 1 align-default-spacing nil)))) + (or group (setq group 1)) + (or spacing (setq spacing align-default-spacing)) (let ((rule (list (list nil (cons 'regexp regexp) (cons 'group (abs group)) -- cgit v1.2.1 From 635f7282c4e6c21b927d8f76c7e087832124dc86 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 20 Aug 2010 19:11:34 -0700 Subject: * lisp/menu-bar.el (menu-bar-games-menu): Add landmark. --- lisp/ChangeLog | 4 ++++ lisp/menu-bar.el | 3 +++ 2 files changed, 7 insertions(+) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0b9731ae904..44cc4c78616 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-08-21 Glenn Morris + + * menu-bar.el (menu-bar-games-menu): Add landmark. + 2010-08-20 Glenn Morris * align.el (align-regexp): Make group and spacing arguments diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index d831744f311..2424647a73f 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -1191,6 +1191,9 @@ mail status in mode line")) (define-key menu-bar-games-menu [life] `(menu-item ,(purecopy "Life") life :help ,(purecopy "Watch how John Conway's cellular automaton evolves"))) +(define-key menu-bar-games-menu [land] + `(menu-item ,(purecopy "Landmark") landmark + :help ,(purecopy "Watch a neural-network robot learn landmarks"))) (define-key menu-bar-games-menu [hanoi] `(menu-item ,(purecopy "Towers of Hanoi") hanoi :help ,(purecopy "Watch Towers-of-Hanoi puzzle solved by Emacs"))) -- cgit v1.2.1 From 3ff786247389f0eb280defb0389d690ee3610bf8 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 21 Aug 2010 10:56:54 +0200 Subject: * subr.el (read-key): Don't echo keystrokes. Fixes: debbugs:6883 --- lisp/ChangeLog | 4 ++++ lisp/subr.el | 1 + 2 files changed, 5 insertions(+) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 44cc4c78616..2403ab0491c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-08-21 Stefan Monnier + + * subr.el (read-key): Don't echo keystrokes (bug#6883). + 2010-08-21 Glenn Morris * menu-bar.el (menu-bar-games-menu): Add landmark. diff --git a/lisp/subr.el b/lisp/subr.el index ad939dc6bb4..a4a0996a726 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1818,6 +1818,7 @@ When there's an ambiguity because the key looks like the prefix of some sort of escape sequence, the ambiguity is resolved via `read-key-delay'." (let ((overriding-terminal-local-map read-key-empty-map) (overriding-local-map nil) + (echo-keystrokes 0) (old-global-map (current-global-map)) (timer (run-with-idle-timer ;; Wait long enough that Emacs has the time to receive and -- cgit v1.2.1 From 8f081e96dec8821ecf3452237b74cfc7ee6a315b Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 21 Aug 2010 11:19:38 +0200 Subject: * progmodes/make-mode.el (makefile-fill-paragraph): Account for the extra backslash added to each line. Fixes: debbugs:6890 --- lisp/ChangeLog | 6 ++++++ lisp/progmodes/make-mode.el | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2403ab0491c..f6aa59c2db5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2010-08-21 Kirk Kelsey (tiny change) + Stefan Monnier + + * progmodes/make-mode.el (makefile-fill-paragraph): Account for the + extra backslash added to each line (bug#6890). + 2010-08-21 Stefan Monnier * subr.el (read-key): Don't echo keystrokes (bug#6883). diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index 594462d5125..d45ecd47907 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -1324,7 +1324,9 @@ definition and conveniently use this command." (save-restriction (narrow-to-region beginning end) (makefile-backslash-region (point-min) (point-max) t) - (let ((fill-paragraph-function nil)) + (let ((fill-paragraph-function nil) + ;; Adjust fill-column to allow space for the backslash. + (fill-column (- fill-column 1))) (fill-paragraph nil)) (makefile-backslash-region (point-min) (point-max) nil) (goto-char (point-max)) @@ -1338,7 +1340,9 @@ definition and conveniently use this command." ;; resulting region. (save-restriction (narrow-to-region (point) (line-beginning-position 2)) - (let ((fill-paragraph-function nil)) + (let ((fill-paragraph-function nil) + ;; Adjust fill-column to allow space for the backslash. + (fill-column (- fill-column 1))) (fill-paragraph nil)) (makefile-backslash-region (point-min) (point-max) nil)) ;; Return non-nil to indicate it's been filled. -- cgit v1.2.1 From e0143335522bda205591cab09407e3bec41c9a40 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Sat, 21 Aug 2010 15:35:27 +0200 Subject: =?UTF-8?q?Fix=20buffer-list=20rename&refresh=20after=20after=20ki?= =?UTF-8?q?lling=20a=20buffer=20in=20ido.=20*=20lisp/ido.el:=20Revert=20?= =?UTF-8?q?=C3=93scar's.=20(ido-kill-buffer-at-head):=20Exit=20the=20minib?= =?UTF-8?q?uffer=20with=20ido-exit=3Drefresh.=20Remember=20the=20buffers?= =?UTF-8?q?=20at=20head,=20rather=20than=20their=20name.=20*=20lisp/iswitc?= =?UTF-8?q?hb.el=20(iswitchb-kill-buffer):=20Re-make=20the=20list.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lisp/ChangeLog | 8 +++++++ lisp/ido.el | 66 ++++++++++++++++++++++---------------------------------- lisp/iswitchb.el | 10 +++++---- 3 files changed, 40 insertions(+), 44 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f6aa59c2db5..2318ce84600 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2010-08-21 Leo + + Fix buffer-list rename&refresh after after killing a buffer in ido. + * lisp/ido.el: Revert Óscar's. + (ido-kill-buffer-at-head): Exit the minibuffer with ido-exit=refresh. + Remember the buffers at head, rather than their name. + * lisp/iswitchb.el (iswitchb-kill-buffer): Re-make the list. + 2010-08-21 Kirk Kelsey (tiny change) Stefan Monnier diff --git a/lisp/ido.el b/lisp/ido.el index 6cedccb3787..a4409775a86 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -1042,11 +1042,11 @@ Value is an integer which is number of chars to right of prompt.") ;; Stores the current list of items that will be searched through. ;; The list is ordered, so that the most interesting item comes first, ;; although by default, the files visible in the current frame are put -;; at the end of the list. -(defvar ido-cur-list nil) +;; at the end of the list. Created by `ido-make-item-list'. +(defvar ido-cur-list) ;; Stores the choice list for ido-completing-read -(defvar ido-choice-list nil) +(defvar ido-choice-list) ;; Stores the list of items which are ignored when building ;; `ido-cur-list'. It is in no specific order. @@ -3348,12 +3348,9 @@ for first matching file." (if ido-temp-list (nconc ido-temp-list ido-current-buffers) (setq ido-temp-list ido-current-buffers)) - (if (and default (buffer-live-p (get-buffer default))) - (progn - (setq ido-temp-list - (delete default ido-temp-list)) - (setq ido-temp-list - (cons default ido-temp-list)))) + (if default + (setq ido-temp-list + (cons default (delete default ido-temp-list)))) (run-hooks 'ido-make-buffer-list-hook) ido-temp-list)) @@ -3594,7 +3591,6 @@ for first matching file." ;; Used by `ido-get-buffers-in-frames' to walk through all windows (let ((buf (buffer-name (window-buffer win)))) (unless (or (member buf ido-bufs-in-frame) - (minibufferp buf) (member buf ido-ignore-item-temp-list)) ;; Only add buf if it is not already in list. ;; This prevents same buf in two different windows being @@ -3835,27 +3831,6 @@ for first matching file." ;;(add-hook 'completion-setup-hook 'completion-setup-function) (display-completion-list completion-list))))))) -(defun ido-kill-buffer-internal (buf) - "Kill buffer BUF and rebuild ido's buffer list if needed." - (if (not (kill-buffer buf)) - ;; buffer couldn't be killed. - (setq ido-rescan t) - ;; else buffer was killed so remove name from list. - (setq ido-cur-list (delq buf ido-cur-list)) - ;; Some packages, like uniquify.el, may rename buffers when one - ;; is killed, so we need to test this condition to avoid using - ;; an outdated list of buffer names. We don't want to always - ;; rebuild the list of buffers, as this alters the previous - ;; buffer order that the user was seeing on the prompt. However, - ;; when we rebuild the list, we try to keep the previous second - ;; buffer as the first one. - (catch 'update - (dolist (b ido-cur-list) - (unless (get-buffer b) - (setq ido-cur-list (ido-make-buffer-list (cadr ido-matches))) - (setq ido-rescan t) - (throw 'update nil)))))) - ;;; KILL CURRENT BUFFER (defun ido-kill-buffer-at-head () "Kill the buffer at the head of `ido-matches'. @@ -3864,15 +3839,26 @@ If cursor is not at the end of the user input, delete to end of input." (if (not (eobp)) (delete-region (point) (line-end-position)) (let ((enable-recursive-minibuffers t) - (buf (ido-name (car ido-matches)))) - (when buf - (ido-kill-buffer-internal buf) - ;; Check if buffer still exists. - (if (get-buffer buf) - ;; buffer couldn't be killed. + (buf (ido-name (car ido-matches))) + (nextbuf (cadr ido-matches))) + (when (get-buffer buf) + ;; If next match names a buffer use the buffer object; buffer + ;; name may be changed by packages such as uniquify; mindful + ;; of virtual buffers. + (when (and nextbuf (get-buffer nextbuf)) + (setq nextbuf (get-buffer nextbuf))) + (if (null (kill-buffer buf)) + ;; Buffer couldn't be killed. (setq ido-rescan t) - ;; else buffer was killed so remove name from list. - (setq ido-cur-list (delq buf ido-cur-list))))))) + ;; Else `kill-buffer' succeeds so re-make the buffer list + ;; taking into account packages like uniquify may rename + ;; buffers. + (if (bufferp nextbuf) + (setq nextbuf (buffer-name nextbuf))) + (setq ido-default-item nextbuf + ido-text-init ido-text + ido-exit 'refresh) + (exit-minibuffer)))))) ;;; DELETE CURRENT FILE (defun ido-delete-file-at-head () @@ -3910,7 +3896,7 @@ Record command in `command-history' if optional RECORD is non-nil." ((eq method 'kill) (if record (ido-record-command 'kill-buffer buffer)) - (ido-kill-buffer-internal buffer)) + (kill-buffer buffer)) ((eq method 'other-window) (if record diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el index ea4b00dc90d..081897a89b3 100644 --- a/lisp/iswitchb.el +++ b/lisp/iswitchb.el @@ -1027,8 +1027,8 @@ Return the modified list with the last element prepended to it." (defun iswitchb-kill-buffer () "Kill the buffer at the head of `iswitchb-matches'." (interactive) - (let ( (enable-recursive-minibuffers t) - buf) + (let ((enable-recursive-minibuffers t) + buf) (setq buf (car iswitchb-matches)) ;; check to see if buf is non-nil. @@ -1042,8 +1042,10 @@ Return the modified list with the last element prepended to it." (if (get-buffer buf) ;; buffer couldn't be killed. (setq iswitchb-rescan t) - ;; else buffer was killed so remove name from list. - (setq iswitchb-buflist (delq buf iswitchb-buflist))))))) + ;; Else `kill-buffer' succeeds so re-make the buffer list + ;; taking into account packages like uniquify may rename + ;; buffers + (iswitchb-make-buflist iswitchb-default)))))) ;;; VISIT CHOSEN BUFFER (defun iswitchb-visit-buffer (buffer) -- cgit v1.2.1 From 41a20de9f4bc77586ed2e7cb4c21cb7f89baaea8 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sun, 22 Aug 2010 00:12:25 -0400 Subject: merge whitespace.el change from trunk --- lisp/ChangeLog | 18 +++++- lisp/whitespace.el | 176 +++++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 161 insertions(+), 33 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2318ce84600..3905bf6db80 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,19 @@ +2010-08-21 Vinicius Jose Latorre + + * whitespace.el: Fix slow cursor movement (Bug#6172). Reported by + Christoph Groth and Liu Xin . + New version 13.0. + (whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp): + Adjust initialization. + (whitespace-bob-marker, whitespace-eob-marker) + (whitespace-buffer-changed): New vars. + (whitespace-cleanup, whitespace-color-on, whitespace-color-off) + (whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp) + (whitespace-post-command-hook, whitespace-display-char-on): + Adjust code. + (whitespace-looking-back, whitespace-buffer-changed): New funs. + (whitespace-space-regexp, whitespace-tab-regexp): Eliminate funs. + 2010-08-21 Leo Fix buffer-list rename&refresh after after killing a buffer in ido. @@ -2295,7 +2311,7 @@ * ps-print.el (ps-face-attributes): It was not returning the attribute face for faces specified as string. Reported by harven - . + . (Bug#5254) (ps-print-version): New version 7.3.5. 2009-12-18 Ulf Jasper diff --git a/lisp/whitespace.el b/lisp/whitespace.el index 5c7d4e95caf..9f4b033e75f 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -6,7 +6,7 @@ ;; Author: Vinicius Jose Latorre ;; Maintainer: Vinicius Jose Latorre ;; Keywords: data, wp -;; Version: 12.1 +;; Version: 13.0 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre ;; This file is part of GNU Emacs. @@ -813,7 +813,7 @@ Used when `whitespace-style' includes `indentation', :group 'whitespace) -(defcustom whitespace-empty-at-bob-regexp "\\`\\(\\([ \t]*\n\\)+\\)" +(defcustom whitespace-empty-at-bob-regexp "^\\(\\([ \t]*\n\\)+\\)" "Specify regexp for empty lines at beginning of buffer. If you're using `mule' package, there may be other characters besides: @@ -828,7 +828,7 @@ Used when `whitespace-style' includes `empty'." :group 'whitespace) -(defcustom whitespace-empty-at-eob-regexp "^\\([ \t\n]+\\)\\'" +(defcustom whitespace-empty-at-eob-regexp "^\\([ \t\n]+\\)" "Specify regexp for empty lines at end of buffer. If you're using `mule' package, there may be other characters besides: @@ -1229,6 +1229,19 @@ Used by `whitespace-trailing-regexp' function (which see).") "Used to save locally the font-lock refontify state. Used by `whitespace-post-command-hook' function (which see).") +(defvar whitespace-bob-marker nil + "Used to save locally the bob marker value. +Used by `whitespace-post-command-hook' function (which see).") + +(defvar whitespace-eob-marker nil + "Used to save locally the eob marker value. +Used by `whitespace-post-command-hook' function (which see).") + +(defvar whitespace-buffer-changed nil + "Used to indicate locally if buffer changed. +Used by `whitespace-post-command-hook' and `whitespace-buffer-changed' +functions (which see).") + ;;;###autoload (defun whitespace-toggle-options (arg) @@ -1464,10 +1477,10 @@ documentation." (let (overwrite-mode) ; enforce no overwrite (goto-char (point-min)) (when (re-search-forward - whitespace-empty-at-bob-regexp nil t) + (concat "\\`" whitespace-empty-at-bob-regexp) nil t) (delete-region (match-beginning 1) (match-end 1))) (when (re-search-forward - whitespace-empty-at-eob-regexp nil t) + (concat whitespace-empty-at-eob-regexp "\\'") nil t) (delete-region (match-beginning 1) (match-end 1))))))) ;; PROBLEM 3: 8 or more SPACEs at bol ;; PROBLEM 4: SPACEs before TAB @@ -2147,8 +2160,15 @@ resultant list will be returned." (set (make-local-variable 'whitespace-point) (point)) (set (make-local-variable 'whitespace-font-lock-refontify) + 0) + (set (make-local-variable 'whitespace-bob-marker) + (point-min-marker)) + (set (make-local-variable 'whitespace-eob-marker) + (point-max-marker)) + (set (make-local-variable 'whitespace-buffer-changed) nil) (add-hook 'post-command-hook #'whitespace-post-command-hook nil t) + (add-hook 'before-change-functions #'whitespace-buffer-changed nil t) ;; turn off font lock (set (make-local-variable 'whitespace-font-lock-mode) font-lock-mode) @@ -2159,7 +2179,7 @@ resultant list will be returned." nil (list ;; Show SPACEs - (list #'whitespace-space-regexp 1 whitespace-space t) + (list whitespace-space-regexp 1 whitespace-space t) ;; Show HARD SPACEs (list whitespace-hspace-regexp 1 whitespace-hspace t)) t)) @@ -2168,7 +2188,7 @@ resultant list will be returned." nil (list ;; Show TABs - (list #'whitespace-tab-regexp 1 whitespace-tab t)) + (list whitespace-tab-regexp 1 whitespace-tab t)) t)) (when (memq 'trailing whitespace-active-style) (font-lock-add-keywords @@ -2298,6 +2318,7 @@ resultant list will be returned." (when (whitespace-style-face-p) (font-lock-mode 0) (remove-hook 'post-command-hook #'whitespace-post-command-hook t) + (remove-hook 'before-change-functions #'whitespace-buffer-changed t) (when whitespace-font-lock (setq whitespace-font-lock nil font-lock-keywords whitespace-font-lock-keywords)) @@ -2318,37 +2339,128 @@ resultant list will be returned." (defun whitespace-empty-at-bob-regexp (limit) "Match spaces at beginning of buffer which do not contain the point at \ beginning of buffer." - (and (/= whitespace-point 1) - (re-search-forward whitespace-empty-at-bob-regexp limit t))) + (let ((b (point)) + r) + (cond + ;; at bob + ((= b 1) + (setq r (and (/= whitespace-point 1) + (looking-at whitespace-empty-at-bob-regexp))) + (if r + (set-marker whitespace-bob-marker (match-end 1)) + (set-marker whitespace-bob-marker b))) + ;; inside bob empty region + ((<= limit whitespace-bob-marker) + (setq r (looking-at whitespace-empty-at-bob-regexp)) + (if r + (when (< (match-end 1) limit) + (set-marker whitespace-bob-marker (match-end 1))) + (set-marker whitespace-bob-marker b))) + ;; intersection with end of bob empty region + ((<= b whitespace-bob-marker) + (setq r (looking-at whitespace-empty-at-bob-regexp)) + (if r + (set-marker whitespace-bob-marker (match-end 1)) + (set-marker whitespace-bob-marker b))) + ;; it is not inside bob empty region + (t + (setq r nil))) + ;; move to end of matching + (and r (goto-char (match-end 1))) + r)) + + +(defsubst whitespace-looking-back (regexp limit) + (save-excursion + (when (/= 0 (skip-chars-backward " \t\n" limit)) + (unless (bolp) + (forward-line 1)) + (looking-at regexp)))) (defun whitespace-empty-at-eob-regexp (limit) "Match spaces at end of buffer which do not contain the point at end of \ buffer." - (and (/= whitespace-point (1+ (buffer-size))) - (re-search-forward whitespace-empty-at-eob-regexp limit t))) - - -(defun whitespace-space-regexp (limit) - "Match spaces." - (setq whitespace-font-lock-refontify t) - (re-search-forward whitespace-space-regexp limit t)) - - -(defun whitespace-tab-regexp (limit) - "Match tabs." - (setq whitespace-font-lock-refontify t) - (re-search-forward whitespace-tab-regexp limit t)) + (let ((b (point)) + (e (1+ (buffer-size))) + r) + (cond + ;; at eob + ((= limit e) + (when (/= whitespace-point e) + (goto-char limit) + (setq r (whitespace-looking-back whitespace-empty-at-eob-regexp b))) + (if r + (set-marker whitespace-eob-marker (match-beginning 1)) + (set-marker whitespace-eob-marker limit) + (goto-char b))) ; return back to initial position + ;; inside eob empty region + ((>= b whitespace-eob-marker) + (goto-char limit) + (setq r (whitespace-looking-back whitespace-empty-at-eob-regexp b)) + (if r + (when (> (match-beginning 1) b) + (set-marker whitespace-eob-marker (match-beginning 1))) + (set-marker whitespace-eob-marker limit) + (goto-char b))) ; return back to initial position + ;; intersection with beginning of eob empty region + ((>= limit whitespace-eob-marker) + (goto-char limit) + (setq r (whitespace-looking-back whitespace-empty-at-eob-regexp b)) + (if r + (set-marker whitespace-eob-marker (match-beginning 1)) + (set-marker whitespace-eob-marker limit) + (goto-char b))) ; return back to initial position + ;; it is not inside eob empty region + (t + (setq r nil))) + r)) + + +(defun whitespace-buffer-changed (beg end) + "Set `whitespace-buffer-changed' variable to t." + (setq whitespace-buffer-changed t)) (defun whitespace-post-command-hook () "Save current point into `whitespace-point' variable. Also refontify when necessary." - (setq whitespace-point (point)) - (let ((refontify (or (eolp) ; end of line - (= whitespace-point 1)))) ; beginning of buffer - (when (or whitespace-font-lock-refontify refontify) - (setq whitespace-font-lock-refontify refontify) + (setq whitespace-point (point)) ; current point position + (let ((refontify + (or + ;; it is at end of line ... + (and (eolp) + ;; ... with trailing SPACE or TAB + (or (= (preceding-char) ?\ ) + (= (preceding-char) ?\t))) + ;; it is at beginning of buffer (bob) + (= whitespace-point 1) + ;; the buffer was modified and ... + (and whitespace-buffer-changed + (or + ;; ... or inside bob whitespace region + (<= whitespace-point whitespace-bob-marker) + ;; ... or at bob whitespace region border + (and (= whitespace-point (1+ whitespace-bob-marker)) + (= (preceding-char) ?\n)))) + ;; it is at end of buffer (eob) + (= whitespace-point (1+ (buffer-size))) + ;; the buffer was modified and ... + (and whitespace-buffer-changed + (or + ;; ... or inside eob whitespace region + (>= whitespace-point whitespace-eob-marker) + ;; ... or at eob whitespace region border + (and (= whitespace-point (1- whitespace-eob-marker)) + (= (following-char) ?\n))))))) + (when (or refontify (> whitespace-font-lock-refontify 0)) + (setq whitespace-buffer-changed nil) + ;; adjust refontify counter + (setq whitespace-font-lock-refontify + (if refontify + 1 + (1- whitespace-font-lock-refontify))) + ;; refontify (jit-lock-refontify)))) @@ -2387,11 +2499,11 @@ Also refontify when necessary." (unless whitespace-display-table-was-local (setq whitespace-display-table-was-local t whitespace-display-table + (copy-sequence buffer-display-table)) + ;; asure `buffer-display-table' is unique + ;; when two or more windows are visible. + (setq buffer-display-table (copy-sequence buffer-display-table))) - ;; asure `buffer-display-table' is unique - ;; when two or more windows are visible. - (set (make-local-variable 'buffer-display-table) - (copy-sequence buffer-display-table)) (unless buffer-display-table (setq buffer-display-table (make-display-table))) (dolist (entry whitespace-display-mappings) -- cgit v1.2.1 From bc7d7ea63ba9d98b3ecc3b6decf4392a651dcbfb Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sun, 22 Aug 2010 15:30:26 -0400 Subject: Doc fix for define-minor-mode (Bug#6880). * doc/lispref/modes.texi (Defining Minor Modes): Doc fix (Bug#6880). * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix (Bug#6880). --- lisp/ChangeLog | 4 ++++ lisp/emacs-lisp/easy-mmode.el | 30 ++++++++++++++---------------- 2 files changed, 18 insertions(+), 16 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3905bf6db80..45a7cf2c87e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-08-22 Chong Yidong + + * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix (Bug#6880). + 2010-08-21 Vinicius Jose Latorre * whitespace.el: Fix slow cursor movement (Bug#6172). Reported by diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index 13e08667839..a48816f99c6 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -86,25 +86,23 @@ replacing its case-insensitive matches with the literal string in LIGHTER." ;;;###autoload (defmacro define-minor-mode (mode doc &optional init-value lighter keymap &rest body) "Define a new minor mode MODE. -This function defines the associated control variable MODE, keymap MODE-map, -and toggle command MODE. - +This defines the control variable MODE and the toggle command MODE. DOC is the documentation for the mode toggle command. + Optional INIT-VALUE is the initial value of the mode's variable. Optional LIGHTER is displayed in the modeline when the mode is on. -Optional KEYMAP is the default (defvar) keymap bound to the mode keymap. - If it is a list, it is passed to `easy-mmode-define-keymap' - in order to build a valid keymap. It's generally better to use - a separate MODE-map variable than to use this argument. -The above three arguments can be skipped if keyword arguments are -used (see below). - -BODY contains code to execute each time the mode is activated or deactivated. - It is executed after toggling the mode, - and before running the hook variable `MODE-hook'. - Before the actual body code, you can write keyword arguments (alternating - keywords and values). These following keyword arguments are supported (other - keywords will be passed to `defcustom' if the minor mode is global): +Optional KEYMAP is the default keymap bound to the mode keymap. + If non-nil, it should be a variable name (whose value is a keymap), + a keymap, or a list of arguments for `easy-mmode-define-keymap'. + If KEYMAP is a keymap or list, this also defines the variable MODE-map. + +BODY contains code to execute each time the mode is enabled or disabled. + It is executed after toggling the mode, and before running MODE-hook. + Before the actual body code, you can write keyword arguments, i.e. + alternating keywords and values. These following special keywords + are supported (other keywords are passed to `defcustom' if the minor + mode is global): + :group GROUP Custom group name to use in all generated `defcustom' forms. Defaults to MODE without the possible trailing \"-mode\". Don't use this default group name unless you have written a -- cgit v1.2.1