------------------------------------------------------------ revno: 116376 fixes bug: http://debbugs.gnu.org/9476 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 22:32:30 -0800 message: * cmds.c (Fself_insert_command): Output a clearer error message on negative repetitions. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-02-09 01:48:47 +0000 +++ src/ChangeLog 2014-02-09 06:32:30 +0000 @@ -1,5 +1,8 @@ 2014-02-09 Lars Ingebrigtsen + * cmds.c (Fself_insert_command): Output a clearer error message on + negative repetitions (bug#9476). + * macros.c (Fexecute_kbd_macro): Doc fix (bug#14206). 2014-02-08 Lars Ingebrigtsen === modified file 'src/cmds.c' --- src/cmds.c 2014-01-01 07:43:34 +0000 +++ src/cmds.c 2014-02-09 06:32:30 +0000 @@ -268,6 +268,7 @@ DEFUN ("self-insert-command", Fself_insert_command, Sself_insert_command, 1, 1, "p", doc: /* Insert the character you type. Whichever character you type to run this command is inserted. +The numeric prefix argument N says how many times to repeat the insertion. Before insertion, `expand-abbrev' is executed if the inserted character does not have word syntax and the previous character in the buffer does. After insertion, the value of `auto-fill-function' is called if the @@ -276,7 +277,11 @@ (Lisp_Object n) { bool remove_boundary = 1; - CHECK_NATNUM (n); + CHECK_NUMBER (n); + + if (XFASTINT (n) < 1) + error ("Repetition argument is %d, but must be higher than 0.", + XFASTINT (n)); if (!EQ (Vthis_command, KVAR (current_kboard, Vlast_command))) nonundocount = 0; ------------------------------------------------------------ revno: 116375 fixes bug: http://debbugs.gnu.org/9825 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 22:14:08 -0800 message: * text.texi (Changing Properties): Clarify `propertize'. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-02-09 05:20:54 +0000 +++ doc/lispref/ChangeLog 2014-02-09 06:14:08 +0000 @@ -1,5 +1,7 @@ 2014-02-09 Lars Ingebrigtsen + * text.texi (Changing Properties): Clarify `propertize' (bug#9825). + * display.texi (Blinking): Clarify doc string in example (bug#10658). * commands.texi (Accessing Mouse): Mention that these function === modified file 'doc/lispref/text.texi' --- doc/lispref/text.texi 2014-01-29 08:27:55 +0000 +++ doc/lispref/text.texi 2014-02-09 06:14:08 +0000 @@ -2866,11 +2866,10 @@ @code{propertize}: @defun propertize string &rest properties -This function returns a copy of @var{string} which has the text -properties @var{properties}. These properties apply to all the -characters in the string that is returned. Here is an example that -constructs a string with a @code{face} property and a @code{mouse-face} -property: +This function returns a copy of @var{string} with the text properties +@var{properties} added. These properties apply to all the characters +in the string that is returned. Here is an example that constructs a +string with a @code{face} property and a @code{mouse-face} property: @smallexample (propertize "foo" 'face 'italic ------------------------------------------------------------ revno: 116374 fixes bug: http://debbugs.gnu.org/9888 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 22:01:33 -0800 message: * help.el (describe-bindings): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-09 05:32:41 +0000 +++ lisp/ChangeLog 2014-02-09 06:01:33 +0000 @@ -1,5 +1,7 @@ 2014-02-09 Lars Ingebrigtsen + * help.el (describe-bindings): Doc fix (bug#9888). + * files.el (save-buffer): Use ARG as the parameter name for consistency (bug#10346). (save-buffer): Clarify the 0 argument (bug#10346). === modified file 'lisp/help.el' --- lisp/help.el 2014-01-30 02:40:19 +0000 +++ lisp/help.el 2014-02-09 06:01:33 +0000 @@ -472,8 +472,8 @@ ;; Key bindings (defun describe-bindings (&optional prefix buffer) - "Show a list of all defined keys, and their definitions. -We put that list in a buffer, and display the buffer. + "Display a buffer showing a list of all defined keys, and their definitions. +The keys are displayed in order of precedence. The optional argument PREFIX, if non-nil, should be a key sequence; then we display only bindings that start with that prefix. ------------------------------------------------------------ revno: 116373 fixes bug: http://debbugs.gnu.org/13261 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 21:32:41 -0800 message: (save-buffer): Clarify the 0 argument (bug#10346). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-09 05:30:41 +0000 +++ lisp/ChangeLog 2014-02-09 05:32:41 +0000 @@ -2,6 +2,7 @@ * files.el (save-buffer): Use ARG as the parameter name for consistency (bug#10346). + (save-buffer): Clarify the 0 argument (bug#10346). * cus-edit.el (customize-apropos): Fix error string. (custom-buffer-create): Doc fix (bug#11122). === modified file 'lisp/files.el' --- lisp/files.el 2014-02-09 05:30:41 +0000 +++ lisp/files.el 2014-02-09 05:32:41 +0000 @@ -4553,7 +4553,7 @@ to become a backup when the next save is done, and unconditionally makes the previous version into a backup file. -With a numeric argument of 0, never make the previous version +With a numeric prefix argument of 0, never make the previous version into a backup file. If a file's name is FOO, the names of its numbered backup versions are ------------------------------------------------------------ revno: 116372 fixes bug: http://debbugs.gnu.org/10346 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 21:30:41 -0800 message: * files.el (save-buffer): Use ARG as the parameter name for consistency diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-09 05:05:06 +0000 +++ lisp/ChangeLog 2014-02-09 05:30:41 +0000 @@ -1,5 +1,8 @@ 2014-02-09 Lars Ingebrigtsen + * files.el (save-buffer): Use ARG as the parameter name for + consistency (bug#10346). + * cus-edit.el (customize-apropos): Fix error string. (custom-buffer-create): Doc fix (bug#11122). (custom-sort-items): Doc fix (bug#11121). === modified file 'lisp/files.el' --- lisp/files.el 2014-02-09 03:02:45 +0000 +++ lisp/files.el 2014-02-09 05:30:41 +0000 @@ -4539,7 +4539,7 @@ ;; We matched FILENAME's directory equivalent. ancestor)))))) -(defun save-buffer (&optional args) +(defun save-buffer (&optional arg) "Save current buffer in visited file if modified. Variations are described below. @@ -4577,9 +4577,9 @@ See the subroutine `basic-save-buffer' for more information." (interactive "p") (let ((modp (buffer-modified-p)) - (make-backup-files (or (and make-backup-files (not (eq args 0))) - (memq args '(16 64))))) - (and modp (memq args '(16 64)) (setq buffer-backed-up nil)) + (make-backup-files (or (and make-backup-files (not (eq arg 0))) + (memq arg '(16 64))))) + (and modp (memq arg '(16 64)) (setq buffer-backed-up nil)) ;; We used to display the message below only for files > 50KB, but ;; then Rmail-mbox never displays it due to buffer swapping. If ;; the test is ever re-introduced, be sure to handle saving of @@ -4587,7 +4587,7 @@ (if (and modp (buffer-file-name)) (message "Saving file %s..." (buffer-file-name))) (basic-save-buffer) - (and modp (memq args '(4 64)) (setq buffer-backed-up nil)))) + (and modp (memq arg '(4 64)) (setq buffer-backed-up nil)))) (defun delete-auto-save-file-if-necessary (&optional force) "Delete auto-save file for current buffer if `delete-auto-save-files' is t. ------------------------------------------------------------ revno: 116371 fixes bug: http://debbugs.gnu.org/10658 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 21:20:54 -0800 message: * display.texi (Blinking): Clarify doc string in example. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-02-09 04:19:52 +0000 +++ doc/lispref/ChangeLog 2014-02-09 05:20:54 +0000 @@ -1,5 +1,7 @@ 2014-02-09 Lars Ingebrigtsen + * display.texi (Blinking): Clarify doc string in example (bug#10658). + * commands.texi (Accessing Mouse): Mention that these function also work on keyboard events (bug#14228). (Quitting): Refer to the right node for `set-input-mode' (bug#11458). === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2014-02-08 05:32:54 +0000 +++ doc/lispref/display.texi 2014-02-09 05:20:54 +0000 @@ -5848,7 +5848,7 @@ @smallexample @group (defun interactive-blink-matching-open () - "Indicate momentarily the start of sexp before point." + "Indicate momentarily the start of parenthesized sexp before point." (interactive) @end group @group ------------------------------------------------------------ revno: 116370 fixes bug: http://debbugs.gnu.org/11122 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 21:05:06 -0800 message: (custom-sort-items): Doc fix (bug#11121). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-09 05:00:37 +0000 +++ lisp/ChangeLog 2014-02-09 05:05:06 +0000 @@ -2,6 +2,7 @@ * cus-edit.el (customize-apropos): Fix error string. (custom-buffer-create): Doc fix (bug#11122). + (custom-sort-items): Doc fix (bug#11121). * dired-aux.el (dired-copy-file-recursive): Remove slighly misleading comment (bug#11328). === modified file 'lisp/cus-edit.el' --- lisp/cus-edit.el 2014-02-09 05:00:37 +0000 +++ lisp/cus-edit.el 2014-02-09 05:05:06 +0000 @@ -699,7 +699,7 @@ (defun custom-sort-items (items sort-alphabetically order-groups) "Return a sorted copy of ITEMS. -ITEMS should be a `custom-group' property. +ITEMS should be a list of `custom-group' properties. If SORT-ALPHABETICALLY non-nil, sort alphabetically. If ORDER-GROUPS is `first' order groups before non-groups, if `last' order groups after non-groups, if nil do not order groups at all." ------------------------------------------------------------ revno: 116369 fixes bug: http://debbugs.gnu.org/11122 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 21:00:37 -0800 message: (custom-buffer-create): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-09 04:57:28 +0000 +++ lisp/ChangeLog 2014-02-09 05:00:37 +0000 @@ -1,6 +1,7 @@ 2014-02-09 Lars Ingebrigtsen * cus-edit.el (customize-apropos): Fix error string. + (custom-buffer-create): Doc fix (bug#11122). * dired-aux.el (dired-copy-file-recursive): Remove slighly misleading comment (bug#11328). === modified file 'lisp/cus-edit.el' --- lisp/cus-edit.el 2014-02-09 04:57:28 +0000 +++ lisp/cus-edit.el 2014-02-09 05:00:37 +0000 @@ -1530,7 +1530,8 @@ Optional NAME is the name of the buffer. OPTIONS should be an alist of the form ((SYMBOL WIDGET)...), where SYMBOL is a customization option, and WIDGET is a widget for editing -that option." +that option. +DESCRIPTION is unused." (pop-to-buffer-same-window (custom-get-fresh-buffer (or name "*Customization*"))) (custom-buffer-create-internal options description)) ------------------------------------------------------------ revno: 116368 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 20:57:28 -0800 message: * cus-edit.el (customize-apropos): Fix error string. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-09 04:30:00 +0000 +++ lisp/ChangeLog 2014-02-09 04:57:28 +0000 @@ -1,5 +1,7 @@ 2014-02-09 Lars Ingebrigtsen + * cus-edit.el (customize-apropos): Fix error string. + * dired-aux.el (dired-copy-file-recursive): Remove slighly misleading comment (bug#11328). === modified file 'lisp/cus-edit.el' --- lisp/cus-edit.el 2014-01-01 07:43:34 +0000 +++ lisp/cus-edit.el 2014-02-09 04:57:28 +0000 @@ -1450,7 +1450,10 @@ (custom-variable-p symbol))) (push (list symbol 'custom-variable) found)))))) (unless found - (error "No customizable %s matching %s" (symbol-name type) pattern)) + (error "No customizable %s matching %s" (if (not type) + "group, face, or option" + (symbol-name type)) + pattern)) (custom-buffer-create (custom-sort-items found t custom-buffer-order-groups) "*Customize Apropos*"))) ------------------------------------------------------------ revno: 116367 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 20:37:38 -0800 message: * message.el (message-tab): Mention what happens on normal tabs (bug#11297). diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2014-02-08 02:07:55 +0000 +++ lisp/gnus/ChangeLog 2014-02-09 04:37:38 +0000 @@ -1,3 +1,8 @@ +2014-02-09 Lars Ingebrigtsen + + * message.el (message-tab): Mention what happens on normal tabs + (bug#11297). + 2014-02-08 Glenn Morris * auth-source.el (auth-sources): Doc fix. (Bug#16642) === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2014-01-09 20:04:39 +0000 +++ lisp/gnus/message.el 2014-02-09 04:37:38 +0000 @@ -7928,8 +7928,9 @@ (defun message-tab () "Complete names according to `message-completion-alist'. -Execute function specified by `message-tab-body-function' when not in -those headers." +Execute function specified by `message-tab-body-function' when +not in those headers. If that variable is nil, indent with the +regular text mode tabbing command." (interactive) (cond ((if (and (boundp 'completion-fail-discreetly) ------------------------------------------------------------ revno: 116366 fixes bug: http://debbugs.gnu.org/11328 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 20:30:00 -0800 message: * dired-aux.el (dired-copy-file-recursive): Remove slighly misleading comment. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-09 03:51:23 +0000 +++ lisp/ChangeLog 2014-02-09 04:30:00 +0000 @@ -1,5 +1,8 @@ 2014-02-09 Lars Ingebrigtsen + * dired-aux.el (dired-copy-file-recursive): Remove slighly + misleading comment (bug#11328). + * repeat.el (repeat-message-function): Reword doc slightly (bug#11619). * icomplete.el (icomplete-with-completion-tables): Doc fix (bug#11654). === modified file 'lisp/dired-aux.el' --- lisp/dired-aux.el 2014-01-02 22:35:00 +0000 +++ lisp/dired-aux.el 2014-02-09 04:30:00 +0000 @@ -1343,9 +1343,7 @@ (eq t (car attrs)) (or (eq recursive 'always) (yes-or-no-p (format "Recursive copies of %s? " from)))) - ;; This is a directory. (copy-directory from to preserve-time) - ;; Not a directory. (or top (dired-handle-overwrite to)) (condition-case err (if (stringp (car attrs)) ------------------------------------------------------------ revno: 116365 fixes bug: http://debbugs.gnu.org/16516 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 20:24:02 -0800 message: * NEWS: Mention all the Apropos face options that have been removed. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-01-31 17:33:12 +0000 +++ etc/ChangeLog 2014-02-09 04:24:02 +0000 @@ -1,3 +1,8 @@ +2014-02-09 Lars Ingebrigtsen + + * NEWS: Mention all the Apropos face options that have been + removed (bug#16516). + 2014-01-31 Dmitry Gutov * NEWS: Mention `ruby-align-chained-calls'. === modified file 'etc/NEWS' --- etc/NEWS 2014-02-09 02:08:17 +0000 +++ etc/NEWS 2014-02-09 04:24:02 +0000 @@ -1879,7 +1879,8 @@ see the `apropos' Custom group for details. *** The old options whose values specified faces to use have been removed -(i.e. `apropos-symbol-face', `apropos-keybinding-face', etc.). +(i.e. `apropos-symbol-face', `apropos-keybinding-face', `apropos-label-face', +`apropos-match-face' and `apropos-property-face'.). ** Buffer Menu ------------------------------------------------------------ revno: 116364 fixes bug: http://debbugs.gnu.org/11458 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 20:19:52 -0800 message: (Quitting): Refer to the right node for `set-input-mode' (bug#11458). diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-02-09 02:13:23 +0000 +++ doc/lispref/ChangeLog 2014-02-09 04:19:52 +0000 @@ -2,6 +2,7 @@ * commands.texi (Accessing Mouse): Mention that these function also work on keyboard events (bug#14228). + (Quitting): Refer to the right node for `set-input-mode' (bug#11458). 2014-02-08 Lars Ingebrigtsen === modified file 'doc/lispref/commands.texi' --- doc/lispref/commands.texi 2014-02-09 02:13:23 +0000 +++ doc/lispref/commands.texi 2014-02-09 04:19:52 +0000 @@ -3047,7 +3047,7 @@ @end deffn You can specify a character other than @kbd{C-g} to use for quitting. -See the function @code{set-input-mode} in @ref{Terminal Input}. +See the function @code{set-input-mode} in @ref{Input Modes}. @node Prefix Command Arguments @section Prefix Command Arguments ------------------------------------------------------------ revno: 116363 fixes bug: http://debbugs.gnu.org/11619 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 19:54:05 -0800 message: * repeat.el (repeat-message-function): Doc fix diff: === modified file 'lisp/repeat.el' --- lisp/repeat.el 2014-02-09 03:51:23 +0000 +++ lisp/repeat.el 2014-02-09 03:54:05 +0000 @@ -111,7 +111,9 @@ Message is something like \"Repeating command glorp\". A value of `ignore' will disable such messages. To customize display, assign a function that takes one string as an arg and -displays it however you want.") +displays it however you want. +If this variable is nil, the normal `message' function will be +used to display the messages.") (defcustom repeat-on-final-keystroke t "Allow `repeat' to re-execute for repeating lastchar of a key sequence. ------------------------------------------------------------ revno: 116362 fixes bug: http://debbugs.gnu.org/11619 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 19:51:23 -0800 message: * repeat.el (repeat-message-function): Reword doc slightly. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-09 03:49:02 +0000 +++ lisp/ChangeLog 2014-02-09 03:51:23 +0000 @@ -1,5 +1,7 @@ 2014-02-09 Lars Ingebrigtsen + * repeat.el (repeat-message-function): Reword doc slightly (bug#11619). + * icomplete.el (icomplete-with-completion-tables): Doc fix (bug#11654). (icomplete-simple-completing-p): Mention the previous variable. === modified file 'lisp/repeat.el' --- lisp/repeat.el 2014-01-01 07:43:34 +0000 +++ lisp/repeat.el 2014-02-09 03:51:23 +0000 @@ -109,9 +109,9 @@ (defvar repeat-message-function nil "If non-nil, function used by `repeat' command to say what it's doing. Message is something like \"Repeating command glorp\". -To disable such messages, set this variable to `ignore'. To customize -display, assign a function that takes one string as an arg and displays -it however you want.") +A value of `ignore' will disable such messages. To customize +display, assign a function that takes one string as an arg and +displays it however you want.") (defcustom repeat-on-final-keystroke t "Allow `repeat' to re-execute for repeating lastchar of a key sequence. ------------------------------------------------------------ revno: 116361 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 19:49:02 -0800 message: (icomplete-simple-completing-p): Mention the previous variable. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-09 03:47:11 +0000 +++ lisp/ChangeLog 2014-02-09 03:49:02 +0000 @@ -1,6 +1,7 @@ 2014-02-09 Lars Ingebrigtsen * icomplete.el (icomplete-with-completion-tables): Doc fix (bug#11654). + (icomplete-simple-completing-p): Mention the previous variable. * font-lock.el (font-lock-value-in-major-mode): Clarify the meaning of the parameter (bug#12282). === modified file 'lisp/icomplete.el' --- lisp/icomplete.el 2014-02-09 03:47:11 +0000 +++ lisp/icomplete.el 2014-02-09 03:49:02 +0000 @@ -237,7 +237,8 @@ and not in the middle of macro execution, and the completion table is not a function (which would indicate some non-standard, non-simple completion mechanism, - like file-name and other custom-func completions)." + like file-name and other custom-func completions), + and `icomplete-with-completion-tables' doesn't restrict completion." (unless executing-kbd-macro (let ((table (icomplete--completion-table))) ------------------------------------------------------------ revno: 116360 fixes bug: http://debbugs.gnu.org/11654 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 19:47:11 -0800 message: * icomplete.el (icomplete-with-completion-tables): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-09 03:25:19 +0000 +++ lisp/ChangeLog 2014-02-09 03:47:11 +0000 @@ -1,5 +1,7 @@ 2014-02-09 Lars Ingebrigtsen + * icomplete.el (icomplete-with-completion-tables): Doc fix (bug#11654). + * font-lock.el (font-lock-value-in-major-mode): Clarify the meaning of the parameter (bug#12282). === modified file 'lisp/icomplete.el' --- lisp/icomplete.el 2014-01-01 07:43:34 +0000 +++ lisp/icomplete.el 2014-02-09 03:47:11 +0000 @@ -150,8 +150,9 @@ (defcustom icomplete-with-completion-tables t "Specialized completion tables with which icomplete should operate. -Icomplete does not operate with any specialized completion tables -except those on this list." +If this variable is a list, Icomplete will not operate with any +specialized completion tables except those on this list. If this +variable is t, it won't restrict completion tables." :version "24.4" :type '(choice (const :tag "All" t) (repeat function))) ------------------------------------------------------------ revno: 116359 fixes bug: http://debbugs.gnu.org/11743 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 19:38:18 -0800 message: * dired.texi (Hiding Subdirectories): Mention the node for deleting subdirectories. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-02-09 02:08:17 +0000 +++ doc/emacs/ChangeLog 2014-02-09 03:38:18 +0000 @@ -1,3 +1,8 @@ +2014-02-09 Lars Ingebrigtsen + + * dired.texi (Hiding Subdirectories): Mention the node for + deleting subdirectories (bug#11743). + 2014-02-09 Glenn Morris * programs.texi (MixedCase Words): Rename node from "Glasses". === modified file 'doc/emacs/dired.texi' --- doc/emacs/dired.texi 2014-01-27 21:26:48 +0000 +++ doc/emacs/dired.texi 2014-02-09 03:38:18 +0000 @@ -1108,7 +1108,8 @@ without having to remove the Dired marks on files in those subdirectories. -@xref{Dired Updating}, for how to insert or delete a subdirectory listing. +@xref{Subdirectories in Dired}, for how to insert a subdirectory +listing, and @pxref{Dired Updating} for how delete it. @node Dired Updating @section Updating the Dired Buffer ------------------------------------------------------------ revno: 116358 fixes bug: http://debbugs.gnu.org/12282 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 19:25:19 -0800 message: * font-lock.el (font-lock-value-in-major-mode): Doc fix Clarify the meaning of the parameter. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-09 03:02:45 +0000 +++ lisp/ChangeLog 2014-02-09 03:25:19 +0000 @@ -1,5 +1,8 @@ 2014-02-09 Lars Ingebrigtsen + * font-lock.el (font-lock-value-in-major-mode): Clarify the + meaning of the parameter (bug#12282). + * files.el (find-file-noselect): Clarify prompt when changing readedness (bug#13261). (locate-file): Suffixes aren't returned, so don't say that they === modified file 'lisp/font-lock.el' --- lisp/font-lock.el 2014-01-14 20:37:28 +0000 +++ lisp/font-lock.el 2014-02-09 03:25:19 +0000 @@ -1764,12 +1764,14 @@ (funcall keywords) (eval keywords))))) -(defun font-lock-value-in-major-mode (alist) - "Return value in ALIST for `major-mode', or ALIST if it is not an alist. -Structure is ((MAJOR-MODE . VALUE) ...) where MAJOR-MODE may be t." - (if (consp alist) - (cdr (or (assq major-mode alist) (assq t alist))) - alist)) +(defun font-lock-value-in-major-mode (values) + "If VALUES is an list, use `major-mode' as a key and return the `assq' value. +VALUES should then be an alist on the form ((MAJOR-MODE . VALUE) ...) where +MAJOR-MODE may be t. +If VALUES isn't a list, return VALUES." + (if (consp values) + (cdr (or (assq major-mode values) (assq t values))) + values)) (defun font-lock-choose-keywords (keywords level) "Return LEVELth element of KEYWORDS. ------------------------------------------------------------ revno: 116357 fixes bug: http://debbugs.gnu.org/12525 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 19:02:45 -0800 message: (backup-inhibited): Doc clarification diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-09 02:58:24 +0000 +++ lisp/ChangeLog 2014-02-09 03:02:45 +0000 @@ -4,6 +4,7 @@ readedness (bug#13261). (locate-file): Suffixes aren't returned, so don't say that they are (bug#12674). + (backup-inhibited): Doc clarification (bug#12525). * dired.el (dired-internal-do-deletions): Don't say "Deleting..." before we actually start to delete things (bug#16331). === modified file 'lisp/files.el' --- lisp/files.el 2014-02-09 02:58:24 +0000 +++ lisp/files.el 2014-02-09 03:02:45 +0000 @@ -96,9 +96,9 @@ ;; Do this so that local variables based on the file name ;; are not overridden by the major mode. (defvar backup-inhibited nil - "Non-nil means don't make a backup, regardless of the other parameters. -This variable is intended for use by making it local to a buffer. -But it is local only if you make it local.") + "If non-nil, backups will be inhibited. +This variable is intended for use by making it local to a buffer, +but it is not an automatically buffer-local variable.") (put 'backup-inhibited 'permanent-local t) (defcustom backup-by-copying nil ------------------------------------------------------------ revno: 116356 fixes bug: http://debbugs.gnu.org/12674 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 18:58:24 -0800 message: (locate-file): Suffixes aren't returned, so don't say that they are diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-09 02:44:25 +0000 +++ lisp/ChangeLog 2014-02-09 02:58:24 +0000 @@ -2,6 +2,8 @@ * files.el (find-file-noselect): Clarify prompt when changing readedness (bug#13261). + (locate-file): Suffixes aren't returned, so don't say that they + are (bug#12674). * dired.el (dired-internal-do-deletions): Don't say "Deleting..." before we actually start to delete things (bug#16331). === modified file 'lisp/files.el' --- lisp/files.el 2014-02-09 02:44:25 +0000 +++ lisp/files.el 2014-02-09 02:58:24 +0000 @@ -747,8 +747,8 @@ (defun locate-file (filename path &optional suffixes predicate) "Search for FILENAME through PATH. -If found, return the absolute file name of FILENAME, with its suffixes; -otherwise return nil. +If found, return the absolute file name of FILENAME; otherwise +return nil. PATH should be a list of directories to look in, like the lists in `exec-path' or `load-path'. If SUFFIXES is non-nil, it should be a list of suffixes to append to ------------------------------------------------------------ revno: 116355 fixes bug: http://debbugs.gnu.org/13261 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 18:44:25 -0800 message: * files.el (find-file-noselect): Clarify prompt when changing readedness. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-09 02:19:15 +0000 +++ lisp/ChangeLog 2014-02-09 02:44:25 +0000 @@ -1,5 +1,8 @@ 2014-02-09 Lars Ingebrigtsen + * files.el (find-file-noselect): Clarify prompt when changing + readedness (bug#13261). + * dired.el (dired-internal-do-deletions): Don't say "Deleting..." before we actually start to delete things (bug#16331). === modified file 'lisp/files.el' --- lisp/files.el 2014-02-08 06:58:15 +0000 +++ lisp/files.el 2014-02-09 02:44:25 +0000 @@ -1910,10 +1910,12 @@ (eq read-only buffer-file-read-only) (eq read-only buffer-read-only)) (when (or nowarn - (let ((question - (format "File %s is %s on disk. Change buffer mode? " - buffer-file-name - (if read-only "read-only" "writable")))) + (let* ((new-status + (if read-only "read-only" "writable")) + (question + (format "File %s is %s on disk. Make buffer %s, too? " + buffer-file-name + new-status new-status))) (y-or-n-p question))) (setq buffer-read-only read-only))) (setq buffer-file-read-only read-only)) ------------------------------------------------------------ revno: 116354 fixes bug: http://debbugs.gnu.org/16331 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 18:19:15 -0800 message: * dired.el (dired-internal-do-deletions) messaging fixup * dired.el (dired-internal-do-deletions): Don't say "Deleting..." before we actually start to delete things. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-09 02:13:23 +0000 +++ lisp/ChangeLog 2014-02-09 02:19:15 +0000 @@ -1,5 +1,8 @@ 2014-02-09 Lars Ingebrigtsen + * dired.el (dired-internal-do-deletions): Don't say "Deleting..." + before we actually start to delete things (bug#16331). + * subr.el (event-start): Doc fix (bug#14228). (event-end): Ditto. === modified file 'lisp/dired.el' --- lisp/dired.el 2014-02-08 06:20:17 +0000 +++ lisp/dired.el 2014-02-09 02:19:15 +0000 @@ -2905,11 +2905,7 @@ (let* ((files (mapcar (function car) l)) (count (length l)) (succ 0) - (trashing (and trash delete-by-moving-to-trash)) - (progress-reporter - (make-progress-reporter - (if trashing "Trashing..." "Deleting...") - succ count))) + (trashing (and trash delete-by-moving-to-trash))) ;; canonicalize file list for pop up (setq files (nreverse (mapcar (function dired-make-relative) files))) (if (dired-mark-pop-up @@ -2918,7 +2914,11 @@ (if trashing "Trash" "Delete") (dired-mark-prompt arg files))) (save-excursion - (let (failures);; files better be in reverse order for this loop! + (let ((progress-reporter + (make-progress-reporter + (if trashing "Trashing..." "Deleting...") + succ count)) + failures) ;; files better be in reverse order for this loop! (while l (goto-char (cdr (car l))) (let ((inhibit-read-only t)) @@ -2931,7 +2931,7 @@ (dired-fun-in-all-buffers (file-name-directory fn) (file-name-nondirectory fn) (function dired-delete-entry) fn)) - (error;; catch errors from failed deletions + (error ;; catch errors from failed deletions (dired-log "%s\n" err) (setq failures (cons (car (car l)) failures))))) (setq l (cdr l))) ------------------------------------------------------------ revno: 116353 fixes bug: http://debbugs.gnu.org/14228 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 18:13:23 -0800 message: Document the `event-start' and `event-end' functions more completely * doc/lispref/commands.texi (Accessing Mouse): Mention that these function also work on keyboard events. * lisp/subr.el (event-start): Doc fix (bug#14228). (event-end): Ditto. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-02-08 05:32:54 +0000 +++ doc/lispref/ChangeLog 2014-02-09 02:13:23 +0000 @@ -1,3 +1,8 @@ +2014-02-09 Lars Ingebrigtsen + + * commands.texi (Accessing Mouse): Mention that these function + also work on keyboard events (bug#14228). + 2014-02-08 Lars Ingebrigtsen * display.texi (Face Attributes): Add an index (bug#14924). === modified file 'doc/lispref/commands.texi' --- doc/lispref/commands.texi 2014-01-05 23:36:13 +0000 +++ doc/lispref/commands.texi 2014-02-09 02:13:23 +0000 @@ -1934,9 +1934,12 @@ @node Accessing Mouse @subsection Accessing Mouse Events @cindex mouse events, data in +@cindex keyboard events, data in This section describes convenient functions for accessing the data in -a mouse button or motion event. +a mouse button or motion event. Keyboard event data can be accessed +using the same functions, but data elements that aren't applicable to +keyboard events are zero or @code{nil}. The following two functions return a mouse position list (@pxref{Click Events}), specifying the position of a mouse event. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-09 00:20:12 +0000 +++ lisp/ChangeLog 2014-02-09 02:13:23 +0000 @@ -1,3 +1,8 @@ +2014-02-09 Lars Ingebrigtsen + + * subr.el (event-start): Doc fix (bug#14228). + (event-end): Ditto. + 2014-02-09 Glenn Morris * emacs-lisp/warnings.el (lwarn): === modified file 'lisp/subr.el' --- lisp/subr.el 2014-02-08 03:37:57 +0000 +++ lisp/subr.el 2014-02-09 02:13:23 +0000 @@ -1019,38 +1019,36 @@ (defun event-start (event) "Return the starting position of EVENT. -EVENT should be a click, drag, or key press event. -If it is a key press event, the return value has the form - (WINDOW POS (0 . 0) 0) -If it is a click or drag event, it has the form - (WINDOW AREA-OR-POS (X . Y) TIMESTAMP OBJECT POS (COL . ROW) - IMAGE (DX . DY) (WIDTH . HEIGHT)) -The `posn-' functions access elements of such lists. -For more information, see Info node `(elisp)Click Events'. - -If EVENT is a mouse or key press or a mouse click, this is the -position of the event. If EVENT is a drag, this is the starting -position of the drag." +EVENT should be a mouse click, drag, or key press event. + +The following accessor functions are used to access the elements +of the position: + +`posn-window': The window the event is in. +`posn-area': A symbol identifying the area the event occurred in, +or nil if the event occurred in the text area. +`posn-point': The buffer position of the event. +`posn-x-y': The pixel-based coordiates of the event. +`posn-col-row': The estimated column and row corresponding to the +position of the event. +`posn-actual-col-row': The actual column and row corresponding to the +position of the event. +`posn-string': The string object of the event, which is either +nil or (STRING . POSITION)'. +`posn-image': The image object of the event, if any. +`posn-object': The image or string object of the event, if any. +`posn-timestamp': The time the event occurred, in milliseconds. + +For more information, see Info node `(elisp)Click Events'." (if (consp event) (nth 1 event) (or (posn-at-point) (list (selected-window) (point) '(0 . 0) 0)))) (defun event-end (event) - "Return the ending location of EVENT. + "Return the ending position of EVENT. EVENT should be a click, drag, or key press event. -If EVENT is a key press event, the return value has the form - (WINDOW POS (0 . 0) 0) -If EVENT is a click event, this function is the same as -`event-start'. For click and drag events, the return value has -the form - (WINDOW AREA-OR-POS (X . Y) TIMESTAMP OBJECT POS (COL . ROW) - IMAGE (DX . DY) (WIDTH . HEIGHT)) -The `posn-' functions access elements of such lists. -For more information, see Info node `(elisp)Click Events'. -If EVENT is a mouse or key press or a mouse click, this is the -position of the event. If EVENT is a drag, this is the starting -position of the drag." +See `event-start' for a description of the value returned." (if (consp event) (nth (if (consp (nth 2 event)) 2 1) event) (or (posn-at-point) (list (selected-window) (point) '(0 . 0) 0)))) ------------------------------------------------------------ revno: 116352 committer: Glenn Morris branch nick: trunk timestamp: Sat 2014-02-08 18:08:17 -0800 message: Doc for subword, superword modes * doc/emacs/programs.texi (MixedCase Words): Rename node from "Glasses". Move Subword mode here from "Other C Commands" node. (Misc for Programs): Mention Superword mode. * doc/emacs/emacs.texi: Update menu. * etc/NEWS: Related markup. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-02-08 13:04:39 +0000 +++ doc/emacs/ChangeLog 2014-02-09 02:08:17 +0000 @@ -1,3 +1,10 @@ +2014-02-09 Glenn Morris + + * programs.texi (MixedCase Words): Rename node from "Glasses". + Move Subword mode here from "Other C Commands" node. + (Misc for Programs): Mention Superword mode. + * emacs.texi: Update menu. + 2014-02-08 Lars Ingebrigtsen * regs.texi (File Registers): Clarify metasyntactical variables === modified file 'doc/emacs/emacs.texi' --- doc/emacs/emacs.texi 2014-01-13 22:21:32 +0000 +++ doc/emacs/emacs.texi 2014-02-09 02:08:17 +0000 @@ -668,7 +668,7 @@ * Documentation:: Getting documentation of functions you plan to call. * Hideshow:: Displaying blocks selectively. * Symbol Completion:: Completion on symbol names of your program or language. -* Glasses:: Making identifiersLikeThis more readable. +* MixedCase Words:: Dealing with identifiersLikeThis. * Semantic:: Suite of editing tools based on source code parsing. * Misc for Programs:: Other Emacs features useful for editing programs. * C Modes:: Special commands of C, C++, Objective-C, === modified file 'doc/emacs/programs.texi' --- doc/emacs/programs.texi 2014-01-26 03:39:34 +0000 +++ doc/emacs/programs.texi 2014-02-09 02:08:17 +0000 @@ -1,3 +1,4 @@ +@c -*- coding: utf-8 -*- @c This is part of the Emacs manual. @c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2014 Free Software @c Foundation, Inc. @@ -35,7 +36,7 @@ * Documentation:: Getting documentation of functions you plan to call. * Hideshow:: Displaying blocks selectively. * Symbol Completion:: Completion on symbol names of your program or language. -* Glasses:: Making identifiersLikeThis more readable. +* MixedCase Words:: Dealing with identifiersLikeThis. * Semantic:: Suite of editing tools based on source code parsing. * Misc for Programs:: Other Emacs features useful for editing programs. * C Modes:: Special commands of C, C++, Objective-C, Java, @@ -1335,24 +1336,37 @@ In Text mode and related modes, @kbd{M-@key{TAB}} completes words based on the spell-checker's dictionary. @xref{Spelling}. -@node Glasses -@section Glasses minor mode +@node MixedCase Words +@section MixedCase Words +@cindex camel case + + Some programming styles make use of mixed-case (or ``CamelCase'') +symbols like @samp{unReadableSymbol}. (In the GNU project, we recommend +using underscores to separate words within an identifier, rather than +using case distinctions.) Emacs has various features to make it easier +to deal with such symbols. + @cindex Glasses mode -@cindex camel case @findex mode, Glasses - - Glasses mode is a buffer-local minor mode that makes it easier to -read mixed-case (or ``CamelCase'') symbols like -@samp{unReadableSymbol}, by altering how they are displayed. By -default, it displays extra underscores between each lower-case letter -and the following capital letter. This does not alter the buffer -text, only how it is displayed. + Glasses mode is a buffer-local minor mode that makes it easier to read +such symbols, by altering how they are displayed. By default, it +displays extra underscores between each lower-case letter and the +following capital letter. This does not alter the buffer text, only how +it is displayed. To toggle Glasses mode, type @kbd{M-x glasses-mode} (@pxref{Minor Modes}). When Glasses mode is enabled, the minor mode indicator @samp{o^o} appears in the mode line. For more information about Glasses mode, type @kbd{C-h P glasses @key{RET}}. +@cindex Subword mode +@findex subword-mode + Subword mode is another buffer-local minor mode. In subword mode, +Emacs's word commands recognize upper case letters in +@samp{StudlyCapsIdentifiers} as word boundaries. When Subword mode is +enabled, the minor mode indicator @samp{,} appears in the mode line. +See also the similar @code{superword-mode} (@pxref{Misc for Programs}). + @node Semantic @section Semantic @cindex Semantic package @@ -1438,6 +1452,19 @@ programming language major mode, indents the new lines which it creates. +@findex superword-mode + Superword mode is a buffer-local minor mode that causes editing and +motion commands to treat symbols (e.g., @samp{this_is_a_symbol}) as words. +When Subword mode is enabled, the minor mode indicator +@iftex +@samp{@math{^2}} +@end iftex +@ifnottex +@samp{²} +@end ifnottex +appears in the mode line. See also the similar @code{subword-mode} +(@pxref{MixedCase Words}). + @findex electric-layout-mode Electric Layout mode (@kbd{M-x electric-layout-mode}) is a global minor mode that automatically inserts newlines when you type certain @@ -1650,19 +1677,6 @@ @subsection Other Commands for C Mode @table @kbd -@item C-c C-w -@itemx M-x subword-mode -@findex subword-mode -Enable (or disable) @dfn{subword mode}. In subword mode, Emacs's word -commands recognize upper case letters in -@samp{StudlyCapsIdentifiers} as word boundaries. This is indicated by -the flag @samp{/w} on the mode line after the mode name -(e.g., @samp{C/law}). You can even use @kbd{M-x subword-mode} in -non-CC Mode buffers. - -In the GNU project, we recommend using underscores to separate words -within an identifier in C or C++, rather than using case distinctions. - @item M-x c-context-line-break @findex c-context-line-break This command inserts a line break and indents the new line in a manner === modified file 'etc/NEWS' --- etc/NEWS 2014-02-07 07:18:02 +0000 +++ etc/NEWS 2014-02-09 02:08:17 +0000 @@ -937,6 +937,7 @@ ** New package `eww' is a built-in web browser. It is only available if Emacs is compiled with libxml2 support. ++++ ** New minor mode `superword-mode'. This overrides the default word motion commands to treat "symbol_words" as a single word, similar to what `subword-mode' does. ------------------------------------------------------------ revno: 116351 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 17:48:47 -0800 message: * macros.c (Fexecute_kbd_macro): Doc fix. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-02-08 05:12:47 +0000 +++ src/ChangeLog 2014-02-09 01:48:47 +0000 @@ -1,3 +1,7 @@ +2014-02-09 Lars Ingebrigtsen + + * macros.c (Fexecute_kbd_macro): Doc fix (bug#14206). + 2014-02-08 Lars Ingebrigtsen * syntax.c (Fskip_syntax_backward): Doc clarification (bug#15115). === modified file 'src/macros.c' --- src/macros.c 2014-01-01 07:43:34 +0000 +++ src/macros.c 2014-02-09 01:48:47 +0000 @@ -292,7 +292,8 @@ DEFUN ("execute-kbd-macro", Fexecute_kbd_macro, Sexecute_kbd_macro, 1, 3, 0, doc: /* Execute MACRO as string of editor command characters. -If MACRO is a symbol, its function definition is used. +MACRO can also be a vector of keyboard events. If MACRO is a symbol, +its function definition is used. COUNT is a repeat count, or nil for once, or 0 for infinite loop. Optional third arg LOOPFUNC may be a function that is called prior to ------------------------------------------------------------ revno: 116350 fixes bug: http://debbugs.gnu.org/15940 committer: Glenn Morris branch nick: trunk timestamp: Sat 2014-02-08 16:20:12 -0800 message: * lisp/emacs-lisp/warnings.el (lwarn): Empower help-enable-auto-load. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-08 23:01:45 +0000 +++ lisp/ChangeLog 2014-02-09 00:20:12 +0000 @@ -1,3 +1,8 @@ +2014-02-09 Glenn Morris + + * emacs-lisp/warnings.el (lwarn): + Empower help-enable-auto-load. (Bug#15940) + 2014-02-08 Andreas Schwab * vc/log-edit.el (log-edit-comment-to-change-log): Doc fix. === modified file 'lisp/emacs-lisp/warnings.el' --- lisp/emacs-lisp/warnings.el 2014-01-01 07:43:34 +0000 +++ lisp/emacs-lisp/warnings.el 2014-02-09 00:20:12 +0000 @@ -306,9 +306,12 @@ (set-window-start window warning-series)) (sit-for 0)))))))) +;; Use \\ so that help-enable-auto-load can do its thing. +;; Any keymap that is defined will do. ;;;###autoload (defun lwarn (type level message &rest args) "Display a warning message made from (format MESSAGE ARGS...). +\\ Aside from generating the message with `format', this is equivalent to `display-warning'. ------------------------------------------------------------ revno: 116349 committer: Andreas Schwab branch nick: emacs timestamp: Sun 2014-02-09 00:01:45 +0100 message: Fixes: debbugs:16690 * vc/log-edit.el (log-edit-comment-to-change-log): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-08 13:35:15 +0000 +++ lisp/ChangeLog 2014-02-08 23:01:45 +0000 @@ -1,3 +1,8 @@ +2014-02-08 Andreas Schwab + + * vc/log-edit.el (log-edit-comment-to-change-log): Doc fix. + (Bug#16690) + 2014-02-08 Michael Albinus * net/tramp-sh.el (tramp-sh-handle-start-file-process): === modified file 'lisp/vc/log-edit.el' --- lisp/vc/log-edit.el 2014-01-13 15:33:01 +0000 +++ lisp/vc/log-edit.el 2014-02-08 23:01:45 +0000 @@ -271,7 +271,7 @@ and site. FILE-NAME is the name of the change log; if nil, use `change-log-default-name'. -This may be useful as a `log-edit-checkin-hook' to update change logs +This may be useful as a `vc-checkin-hook' to update change logs automatically." (interactive (if current-prefix-arg (list current-prefix-arg ------------------------------------------------------------ revno: 116348 committer: Michael Albinus branch nick: trunk timestamp: Sat 2014-02-08 14:35:15 +0100 message: * net/tramp-sh.el (tramp-sh-handle-start-file-process): Insert output at end of buffer. (Bug#16120) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-08 13:13:46 +0000 +++ lisp/ChangeLog 2014-02-08 13:35:15 +0000 @@ -1,3 +1,8 @@ +2014-02-08 Michael Albinus + + * net/tramp-sh.el (tramp-sh-handle-start-file-process): + Insert output at end of buffer. (Bug#16120) + 2014-02-08 Lars Ingebrigtsen * simple.el (choose-completion-string-functions): Document new === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2014-02-06 08:49:34 +0000 +++ lisp/net/tramp-sh.el 2014-02-08 13:35:15 +0000 @@ -2758,7 +2758,7 @@ ;; `verify-visited-file-modtime'. (let ((buffer-undo-list t) (buffer-read-only nil) - (mark (point))) + (mark (point-max))) (clear-visited-file-modtime) (narrow-to-region (point-max) (point-max)) ;; We call `tramp-maybe-open-connection', in order ------------------------------------------------------------ revno: 116347 fixes bug: http://debbugs.gnu.org/13373 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 05:13:46 -0800 message: (execute-extended-command): Clarify doc string (bug#13373). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-08 12:46:09 +0000 +++ lisp/ChangeLog 2014-02-08 13:13:46 +0000 @@ -2,6 +2,7 @@ * simple.el (choose-completion-string-functions): Document new calling convention (bug#14153). + (execute-extended-command): Clarify doc string (bug#13373). * kmacro.el (kmacro-exec-ring-item): Doc fix (bug#14198). === modified file 'lisp/simple.el' --- lisp/simple.el 2014-02-08 12:46:09 +0000 +++ lisp/simple.el 2014-02-08 13:13:46 +0000 @@ -1567,13 +1567,11 @@ (defun execute-extended-command (prefixarg &optional command-name) ;; Based on Fexecute_extended_command in keyboard.c of Emacs. ;; Aaron S. Hawley 2009-08-24 - "Read function name, then read its arguments and call it. - -To pass a numeric argument to the command you are invoking, specify -the numeric argument to this command. - + "Read a command name, then read the arguments and call the command. +Interactively, to pass a prefix argument to the command you are +invoking, give a prefix argument to `execute-extended-command'. Noninteractively, the argument PREFIXARG is the prefix argument to -give to the command you invoke, if it asks for an argument." +give to the command you invoke." (interactive (list current-prefix-arg (read-extended-command))) ;; Emacs<24 calling-convention was with a single `prefixarg' argument. (if (null command-name) ------------------------------------------------------------ revno: 116346 fixes bug: http://debbugs.gnu.org/13565 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 05:04:39 -0800 message: * regs.texi (File Registers): Clarify metasyntactical variables. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-02-08 06:51:42 +0000 +++ doc/emacs/ChangeLog 2014-02-08 13:04:39 +0000 @@ -1,5 +1,8 @@ 2014-02-08 Lars Ingebrigtsen + * regs.texi (File Registers): Clarify metasyntactical variables + (bug#13565). + * search.texi (Search Case): Rearrange text slightly to make it obvious that `M-c' also toggles sensitivity if `case-fold-search' is nil (bug#14726). === modified file 'doc/emacs/regs.texi' --- doc/emacs/regs.texi 2014-02-02 01:04:08 +0000 +++ doc/emacs/regs.texi 2014-02-08 13:04:39 +0000 @@ -240,10 +240,10 @@ If you visit certain file names frequently, you can visit them more conveniently if you put their names in registers. Here's the Lisp code -used to put a file name in a register: +used to put a file @var{name} into register @var{r}: @smallexample -(set-register ?@var{r} '(file . @var{name})) +(set-register @var{r} '(file . @var{name})) @end smallexample @need 3000 ------------------------------------------------------------ revno: 116345 fixes bug: http://debbugs.gnu.org/14153 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 04:46:09 -0800 message: * simple.el (choose-completion-string-functions): Document fix. New calling convention. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-08 12:34:52 +0000 +++ lisp/ChangeLog 2014-02-08 12:46:09 +0000 @@ -1,5 +1,8 @@ 2014-02-08 Lars Ingebrigtsen + * simple.el (choose-completion-string-functions): Document new + calling convention (bug#14153). + * kmacro.el (kmacro-exec-ring-item): Doc fix (bug#14198). * find-dired.el (find-name-dired): Doc fix (bug#14290). === modified file 'lisp/simple.el' --- lisp/simple.el 2014-02-08 06:28:12 +0000 +++ lisp/simple.el 2014-02-08 12:46:09 +0000 @@ -6986,12 +6986,10 @@ (defvar choose-completion-string-functions nil "Functions that may override the normal insertion of a completion choice. -These functions are called in order with four arguments: +These functions are called in order with three arguments: CHOICE - the string to insert in the buffer, BUFFER - the buffer in which the choice should be inserted, -MINI-P - non-nil if BUFFER is a minibuffer, and -BASE-SIZE - the number of characters in BUFFER before -the string being completed. +BASE-POSITION - where to insert the completion. If a function in the list returns non-nil, that function is supposed to have inserted the CHOICE in the BUFFER, and possibly exited ------------------------------------------------------------ revno: 116344 fixes bug: http://debbugs.gnu.org/14198 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 04:34:52 -0800 message: * kmacro.el (kmacro-exec-ring-item): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-08 11:09:10 +0000 +++ lisp/ChangeLog 2014-02-08 12:34:52 +0000 @@ -1,5 +1,7 @@ 2014-02-08 Lars Ingebrigtsen + * kmacro.el (kmacro-exec-ring-item): Doc fix (bug#14198). + * find-dired.el (find-name-dired): Doc fix (bug#14290). (find-grep-dired): Doc fix (bug#14288). === modified file 'lisp/kmacro.el' --- lisp/kmacro.el 2014-02-03 00:40:49 +0000 +++ lisp/kmacro.el 2014-02-08 12:34:52 +0000 @@ -445,7 +445,8 @@ ;;;###autoload (defun kmacro-exec-ring-item (item arg) - "Execute item ITEM from the macro ring." + "Execute item ITEM from the macro ring. +ARG is the number of times to excute the item." ;; Use counter and format specific to the macro on the ring! (let ((kmacro-counter (nth 1 item)) (kmacro-counter-format-start (nth 2 item))) ------------------------------------------------------------ revno: 116343 fixes bug: http://debbugs.gnu.org/14288 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 03:09:10 -0800 message: (find-grep-dired): Doc fix (bug#14288). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-08 11:06:33 +0000 +++ lisp/ChangeLog 2014-02-08 11:09:10 +0000 @@ -1,6 +1,7 @@ 2014-02-08 Lars Ingebrigtsen * find-dired.el (find-name-dired): Doc fix (bug#14290). + (find-grep-dired): Doc fix (bug#14288). 2014-02-08 Juri Linkov === modified file 'lisp/find-dired.el' --- lisp/find-dired.el 2014-02-08 11:06:33 +0000 +++ lisp/find-dired.el 2014-02-08 11:09:10 +0000 @@ -254,7 +254,7 @@ (defalias 'lookfor-dired 'find-grep-dired) ;;;###autoload (defun find-grep-dired (dir regexp) - "Find files in DIR containing a regexp REGEXP and start Dired on output. + "Find files in DIR matching a regexp REGEXP and start Dired on output. The command run (after changing into DIR) is find . \\( -type f -exec `grep-program' `find-grep-options' \\ ------------------------------------------------------------ revno: 116342 fixes bug: http://debbugs.gnu.org/14290 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-08 03:06:33 -0800 message: * find-dired.el (find-name-dired): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-08 10:20:45 +0000 +++ lisp/ChangeLog 2014-02-08 11:06:33 +0000 @@ -1,3 +1,7 @@ +2014-02-08 Lars Ingebrigtsen + + * find-dired.el (find-name-dired): Doc fix (bug#14290). + 2014-02-08 Juri Linkov * isearch.el (isearch-quote-char): Check character validity === modified file 'lisp/find-dired.el' --- lisp/find-dired.el 2014-01-01 07:43:34 +0000 +++ lisp/find-dired.el 2014-02-08 11:06:33 +0000 @@ -236,9 +236,11 @@ "Search DIR recursively for files matching the globbing pattern PATTERN, and run dired on those files. PATTERN is a shell wildcard (not an Emacs regexp) and need not be quoted. -The command run (after changing into DIR) is - - find . -name 'PATTERN' -ls" +The default command run (after changing into DIR) is + + find . -name 'PATTERN' -ls + +See `find-name-arg' to customize the arguments." (interactive "DFind-name (directory): \nsFind-name (filename wildcard): ") (find-dired dir (concat find-name-arg " " (shell-quote-argument pattern)))) ------------------------------------------------------------ revno: 116341 fixes bug: http://debbugs.gnu.org/14762 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2014-02-08 12:25:33 +0200 message: Fix bug #14762 with insufficient and outdated w32 installation documentation. nt/INSTALL: Update for Emacs 24.4. nt/README: Update for Emacs 24.4. nt/README.W32: Update and improve instructions. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2014-02-08 06:36:11 +0000 +++ nt/ChangeLog 2014-02-08 10:25:33 +0000 @@ -1,3 +1,11 @@ +2014-02-08 Eli Zaretskii + + * INSTALL: Update for Emacs 24.4. + + * README: Update for Emacs 24.4. + + * README.W32: Update and improve instructions. (Bug#14762) + 2014-02-08 Lars Ingebrigtsen * README.W32: Say what GnuTLS and libxml2 does (bug#14762). === modified file 'nt/INSTALL' --- nt/INSTALL 2014-01-09 00:10:07 +0000 +++ nt/INSTALL 2014-02-08 10:25:33 +0000 @@ -568,6 +568,14 @@ libraries that are known to be compatible with the version given by `libgif-version'. + For JPEG images, you will need libjpeg 6b or later, which will be + called libjpeg-N.dll, jpeg62.dll, libjpeg.dll, or jpeg.dll. You can + find these on the ezwinports site. + + TIFF images require libTIFF 3.0 or later, which will be called + libtiffN.dll or libtiff-N.dll or libtiff.dll. These can be found on + the ezwinports site. + Pre-built versions of librsvg and its dependencies can be found in one of these places: === modified file 'nt/README' --- nt/README 2014-01-01 07:43:34 +0000 +++ nt/README 2014-02-08 10:25:33 +0000 @@ -25,15 +25,17 @@ Building and installing Emacs will produce the following executable files in the bin directory. - + emacs.exe - The main Emacs executable. As this is designed to run + + emacs.exe - The main Emacs executable. As this is designed to run as both a text-mode application (emacs -nw) and as a GUI application, it will pop up a command prompt window if run directly from Explorer. + runemacs.exe - A wrapper for running Emacs as a GUI application - without popping up a command prompt window. + without popping up a command prompt window. If you create a + desktop shortcut for invoking Emacs, make it point to this + executable, not to emacs.exe. + emacsclient.exe - A command-line client program that can - communicate with a running Emacs process. See the `Emacs Server' + communicate with a running Emacs process. See the `Emacs Server' node of the Emacs manual. + emacsclientw.exe - A version of emacsclient that does not open @@ -42,15 +44,18 @@ + addpm.exe - A basic installer that creates Start Menu icons for Emacs. Running this is optional. - + cmdproxy.exe - Used internally by Emacs to work around problems with - the native shells in various versions of Windows. - + ctags.exe, etags.exe - Tools for generating tag files. See the - `Tags' node of the Emacs manual. + `Tags' node of the Emacs manual. + ebrowse.exe - A tool for generating C++ browse information. See the `Ebrowse' manual. + Several helper programs are installed in a version-specific + subdirectory of the libexec directory: + + + cmdproxy.exe - Used internally by Emacs to work around problems with + the native shells in various versions of Windows. + + ddeclient.exe - A tool for interacting with DDE servers. To be invoked as "ddeclient SERVER [TOPIC]", where SERVER is the DDE server name, and sends each line of its standard input to the DDE @@ -58,13 +63,19 @@ supposed to be invoked via the 'call-process-region' Emacs primitive. - + hexl.exe - A tool for converting files to hex dumps. See the + + hexl.exe - A tool for producing hex dumps of binary files. See the `Editing Binary Files' node of the Emacs manual. + movemail.exe - A helper application for safely moving mail from a mail spool or POP server to a local user mailbox. See the `Movemail' node of the Emacs manual. + + profile.exe - A helper program that generates periodic events for + profiling Emacs Lisp code. + + + update-game-score.exe - A utility for updating the score files of + Emacs games. + * Further information The FAQ for the MS Windows port of Emacs is distributed with Emacs === modified file 'nt/README.W32' --- nt/README.W32 2014-02-08 06:36:11 +0000 +++ nt/README.W32 2014-02-08 10:25:33 +0000 @@ -10,13 +10,14 @@ ftp://ftp.gnu.org/gnu/emacs/windows/ This server contains other distributions, including the full Emacs - source distribution and a barebin distribution which can be installed - over it, as well as older releases of Emacs for Windows. + source distribution, as well as older releases of Emacs for Windows. Information on how to compile Emacs from sources on Windows is in - the files README and INSTALL in this directory. If you received - this file as part of the Emacs source distribution, please read - those 2 files and not this one. + the files README and INSTALL in the nt/ sub-directory of the + top-level Emacs directory in the source distribution. If you + received this file as part of the Emacs source distribution, and are + looking for information on how to build Emacs on MS-Windows, please + read those 2 files and not this one. * Preliminaries @@ -26,11 +27,10 @@ * Setting up Emacs To install Emacs, simply unpack all the files into a directory of - your choice, but note that you might encounter minor problems if - there is a space anywhere in the directory name. To complete the - installation process, you can optionally run the program addpm.exe - in the bin subdirectory. This will put an icon for Emacs in the - Start Menu under "Start -> Programs -> Gnu Emacs". + your choice. To complete the installation process, you can + optionally run the program addpm.exe in the bin subdirectory. This + will put an icon for Emacs in the Start Menu under + "Start -> Programs -> Gnu Emacs". Some users have reported that the Start Menu item is not created for them. If this happens, just create your own shortcut to runemacs.exe, @@ -52,9 +52,7 @@ downloaded from the Microsoft site, and comes in a form of a single dynamic library called UNICOWS.DLL. If this library is not accessible to Emacs, it will pop up a dialog saying that it cannot - find the library, and will refuse to start up a GUI session. - (However, it is still possible to use Emacs in text mode, even - without UNICOWS.DLL, by invoking it as "emacs -nw", see below.) + find the library, and will refuse to start up. * Starting Emacs @@ -130,24 +128,31 @@ * Image support Emacs has built in support for XBM and PPM/PGM/PBM images, and the + libXpm library is bundled, providing XPM support (required for color + toolbar icons and splash screen). Source for libXpm should be available + from the same place from which you got this binary distribution. + + Emacs can also support some other image formats with appropriate libraries. These libraries are all available on the following sites: 1. http://sourceforge.net/projects/ezwinports/files/ -- leaner, more up-to-date builds, only for 32-bit Emacs 2. http://www.gtk.org/download/win32.php http://www.gtk.org/download/win64.php - -- GTK project site; offers much fatter builds, but includes 64-bit - DLLs + -- the GTK project site; offers much fatter builds, but includes + 64-bit DLLs (from the 2nd URL) 3. GnuWin32 project -- very old builds, not recommended + The libraries to download are mentioned below. Some libraries + depend on others that need to be downloaded separately from the same + site; please consult the download instructions on each site for the + details. In general, the ezwinports site mentioned above has all + the dependencies bundled in the same zip archive, so installing from + there is the easiest. + Emacs will find these libraries if the directory they are installed - in is on the PATH. - - Emacs can also support some other image formats with appropriate - libraries. These libraries are all available as part of GTK - download for Windows (http://www.gtk.org/download/win32.php), or - from the GnuWin32 project. Emacs will find them if the directory - they are installed in is on the PATH. + in is on the PATH or in the same directory where you have emacs.exe. + Here are some specific comments about each image type: PNG: requires the PNG reference library 1.4 or later, which will be named libpngNN.dll or libpngNN-NN.dll. LibPNG requires zlib, @@ -161,8 +166,8 @@ JPEG: requires the Independent JPEG Group's libjpeg 6b or later, which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll. - TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll - or libtiff.dll. + TIFF: requires libTIFF 3.0 or later, which will be called libtiffN.dll + or libtiff-N.dll or libtiff.dll. GIF: requires libungif or giflib 4.1 or later, which will be called libgif-6.dll, giflib4.dll, libungif4.dll or libungif.dll. @@ -171,18 +176,12 @@ librsvg-2-2.dll. SVG also requires several dependency DLLs, such as Pango, Cairo, and Glib, all of them found on the above-mentioned sites. If you download from the ezwinports - site, you need only librsvg-2.nn.x-bin.zip, it comes with all - the other dependencies bundled. + site, you need only librsvg-2.nn.mm-x-w32-bin.zip, it comes with + all the other dependencies bundled. If you have image support DLLs under different names, customize the value of `dynamic-library-alist'. - In addition, Emacs can be compiled to support SVG. This precompiled - distribution has not been compiled that way, since the SVG library - or one or more of its extensive dependencies appear to be - unreliable under Windows. See nt/INSTALL in the src distribution if - you wish to compile Emacs with SVG support. - * GnuTLS support GnuTLS provides SSL/TLS network support for Emacs (https, imaps and ------------------------------------------------------------ revno: 116340 fixes bug: http://debbugs.gnu.org/16677 committer: Juri Linkov branch nick: trunk timestamp: Sat 2014-02-08 12:20:45 +0200 message: * lisp/isearch.el (isearch-quote-char): Check character validity like in `quoted-insert'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-08 06:58:15 +0000 +++ lisp/ChangeLog 2014-02-08 10:20:45 +0000 @@ -1,3 +1,8 @@ +2014-02-08 Juri Linkov + + * isearch.el (isearch-quote-char): Check character validity + like in `quoted-insert' (bug#16677). + 2014-02-08 Lars Ingebrigtsen * files.el (find-file-visit-truename): Doc clarification (bug#14697). === modified file 'lisp/isearch.el' --- lisp/isearch.el 2014-02-08 06:56:18 +0000 +++ lisp/isearch.el 2014-02-08 10:20:45 +0000 @@ -2301,6 +2301,9 @@ With argument, add COUNT copies of the character." (interactive "p") (let ((char (read-quoted-char (isearch-message t)))) + (unless (characterp char) + (user-error "%s is not a valid character" + (key-description (vector char)))) ;; Assume character codes 0200 - 0377 stand for characters in some ;; single-byte character set, and convert them to Emacs ;; characters. ------------------------------------------------------------ revno: 116339 fixes bug: http://debbugs.gnu.org/14697 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Fri 2014-02-07 22:58:15 -0800 message: * files.el (find-file-visit-truename): Doc clarification (bug#14697). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-08 06:56:18 +0000 +++ lisp/ChangeLog 2014-02-08 06:58:15 +0000 @@ -1,5 +1,7 @@ 2014-02-08 Lars Ingebrigtsen + * files.el (find-file-visit-truename): Doc clarification (bug#14697). + * isearch.el (isearch-hide-immediately): Doc clarification (bug#14723). === modified file 'lisp/files.el' --- lisp/files.el 2014-02-08 04:53:52 +0000 +++ lisp/files.el 2014-02-08 06:58:15 +0000 @@ -159,9 +159,11 @@ :group 'find-file) (defcustom find-file-visit-truename nil - "Non-nil means visit a file under its truename. -The truename of a file is found by chasing all links -both at the file level and at the levels of the containing directories." + "Non-nil means visiting a file uses its truename as the visited-file name. +That is, the buffer visiting the file has the truename as the +value of `buffer-file-name'. The truename of a file is found by +chasing all links both at the file level and at the levels of the +containing directories." :type 'boolean :group 'find-file) (put 'find-file-visit-truename 'safe-local-variable 'booleanp)