Now on revision 104903. ------------------------------------------------------------ revno: 104903 fixes bug(s): http://debbugs.gnu.org/6599 author: Kevin Ryde committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sun 2011-07-03 14:40:59 +0200 message: * cl.texi (For Clauses): @items for hash-values and key-bindings to make them more visible when skimming. Add examples of `using' clause to them, examples being clearer than a description in words. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-07-01 09:42:55 +0000 +++ doc/misc/ChangeLog 2011-07-03 12:40:59 +0000 @@ -1,3 +1,10 @@ +2011-07-03 Kevin Ryde + + * cl.texi (For Clauses): @items for hash-values and key-bindings + to make them more visible when skimming. Add examples of `using' + clause to them, examples being clearer than a description in + words (bug#6599). + 2011-07-01 Alan Mackenzie * cc-mode.texi (Guessing the Style): New page. === modified file 'doc/misc/cl.texi' --- doc/misc/cl.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/cl.texi 2011-07-03 12:40:59 +0000 @@ -2449,22 +2449,33 @@ or @code{while}. @item for @var{var} being the hash-keys of @var{hash-table} -This clause iterates over the entries in @var{hash-table}. For each -hash table entry, @var{var} is bound to the entry's key. If you write -@samp{the hash-values} instead, @var{var} is bound to the values -of the entries. The clause may be followed by the additional -term @samp{using (hash-values @var{var2})} (where @code{hash-values} -is the opposite word of the word following @code{the}) to cause -@var{var} and @var{var2} to be bound to the two parts of each -hash table entry. +@itemx for @var{var} being the hash-values of @var{hash-table} +This clause iterates over the entries in @var{hash-table} with +@var{var} bound to each key, or value. A @samp{using} clause can bind +a second variable to the opposite part. + +@example +(loop for k being the hash-keys of h + using (hash-values v) + do + (message "key %S -> value %S" k v)) +@end example @item for @var{var} being the key-codes of @var{keymap} +@itemx for @var{var} being the key-bindings of @var{keymap} This clause iterates over the entries in @var{keymap}. The iteration does not enter nested keymaps but does enter inherited (parent) keymaps. -You can use @samp{the key-bindings} to access the commands bound to -the keys rather than the key codes, and you can add a @code{using} -clause to access both the codes and the bindings together. +A @code{using} clause can access both the codes and the bindings +together. + +@example +(loop for c being the key-codes of (current-local-map) + using (key-bindings b) + do + (message "key %S -> binding %S" c b)) +@end example + @item for @var{var} being the key-seqs of @var{keymap} This clause iterates over all key sequences defined by @var{keymap} ------------------------------------------------------------ revno: 104902 fixes bug(s): http://debbugs.gnu.org/6496 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sun 2011-07-03 14:33:37 +0200 message: * functions.texi (What Is a Function): Document the autoload object. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-07-02 23:52:35 +0000 +++ doc/lispref/ChangeLog 2011-07-03 12:33:37 +0000 @@ -1,3 +1,8 @@ +2011-07-03 Lars Magne Ingebrigtsen + + * functions.texi (What Is a Function): Document the autoload + object (bug#6496). + 2011-07-02 Lars Magne Ingebrigtsen * customize.texi (Variable Definitions): Clarify that SETFUNCTION === modified file 'doc/lispref/functions.texi' --- doc/lispref/functions.texi 2011-02-25 03:27:45 +0000 +++ doc/lispref/functions.texi 2011-07-03 12:33:37 +0000 @@ -112,6 +112,13 @@ @item byte-code function A @dfn{byte-code function} is a function that has been compiled by the byte compiler. @xref{Byte-Code Type}. + +@item autoload object +@cindex autoload object +An @dfn{autoload object} is a place-holder for a real function. If +the autoload object is called, it will make Emacs load the file +containing the definition of the real function, and then call the real +function instead. @end table @defun functionp object ------------------------------------------------------------ revno: 104901 [merge] committer: Paul Eggert branch nick: trunk timestamp: Sat 2011-07-02 23:18:50 -0700 message: Merge: minor issues caught by GCC 4.6.0. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-02 23:40:04 +0000 +++ src/ChangeLog 2011-07-03 06:17:19 +0000 @@ -1,3 +1,10 @@ +2011-07-03 Paul Eggert + + * xsettings.c (SYSTEM_FONT): Define only when used. + No need to define when HAVE_GSETTINGS || !HAVE_XFT. + + * keymap.c (access_keymap_1): Now static. + 2011-07-02 Chong Yidong * keyboard.c (command_loop_1): If a down-mouse event is unbound, === modified file 'src/keymap.c' --- src/keymap.c 2011-07-02 04:27:41 +0000 +++ src/keymap.c 2011-07-03 06:15:12 +0000 @@ -388,7 +388,7 @@ Returns Qunbound if no binding was found (and returns Qnil if a nil binding was found). */ -Lisp_Object +static Lisp_Object access_keymap_1 (Lisp_Object map, Lisp_Object idx, int t_ok, int noinherit, int autoload) { /* If idx is a list (some sort of mouse click, perhaps?), === modified file 'src/xsettings.c' --- src/xsettings.c 2011-07-01 09:18:46 +0000 +++ src/xsettings.c 2011-07-03 06:17:19 +0000 @@ -128,7 +128,6 @@ #ifdef HAVE_GSETTINGS #define GSETTINGS_SCHEMA "org.gnome.desktop.interface" #define SYSTEM_MONO_FONT "monospace-font-name" -#define SYSTEM_FONT "font-name" static void something_changedCB (GSettings *settings, @@ -153,7 +152,10 @@ #else #ifdef HAVE_GCONF #define SYSTEM_MONO_FONT "/desktop/gnome/interface/monospace_font_name" -#define SYSTEM_FONT "/desktop/gnome/interface/font_name" + +#ifdef HAVE_XFT +# define SYSTEM_FONT "/desktop/gnome/interface/font_name" +#endif /* Callback called when something changed in GConf that we care about, that is SYSTEM_MONO_FONT. */ @@ -697,7 +699,7 @@ g_object_ref_sink (G_OBJECT (gsettings_client)); val = g_settings_get_value (gsettings_client, SYSTEM_MONO_FONT); - if (val) + if (val) { g_variant_ref_sink (val); if (g_variant_is_of_type (val, G_VARIANT_TYPE_STRING)) ------------------------------------------------------------ revno: 104900 fixes bug(s): http://debbugs.gnu.org/6475 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sun 2011-07-03 04:37:52 +0200 message: * fringe.el (fringe-query-style): Remove redundant text " (type ? for list)" (bug#6475). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-03 01:48:07 +0000 +++ lisp/ChangeLog 2011-07-03 02:37:52 +0000 @@ -1,5 +1,8 @@ 2011-07-03 Lars Magne Ingebrigtsen + * fringe.el (fringe-query-style): Remove redundant text " (type ? + for list)" (bug#6475). + * files.el (file-expand-wildcards): Ignore non-readable sub-directories while trying to find matches instead of signalling an error (bug#6297). === modified file 'lisp/fringe.el' --- lisp/fringe.el 2011-04-19 13:44:55 +0000 +++ lisp/fringe.el 2011-07-03 02:37:52 +0000 @@ -192,7 +192,7 @@ (concat "Select fringe mode for " (if all-frames "all frames" "selected frame") - " (type ? for list): ") + ": ") fringe-styles nil t)) (style (assoc (downcase mode) fringe-styles))) (if style (cdr style) ------------------------------------------------------------ revno: 104899 fixes bug(s): http://debbugs.gnu.org/6297 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sun 2011-07-03 03:48:07 +0200 message: * files.el (file-expand-wildcards): Ignore non-readable sub-directories while trying to find matches instead of signalling an error (bug#6297). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-03 01:35:35 +0000 +++ lisp/ChangeLog 2011-07-03 01:48:07 +0000 @@ -1,5 +1,9 @@ 2011-07-03 Lars Magne Ingebrigtsen + * files.el (file-expand-wildcards): Ignore non-readable + sub-directories while trying to find matches instead of signalling + an error (bug#6297). + * man.el (Man-reference-regexp): Allow matching possible word-wrapped references (bug#6289). === modified file 'lisp/files.el' --- lisp/files.el 2011-06-30 01:39:52 +0000 +++ lisp/files.el 2011-07-03 01:48:07 +0000 @@ -5560,7 +5560,8 @@ contents) (while dirs (when (or (null (car dirs)) ; Possible if DIRPART is not wild. - (file-directory-p (directory-file-name (car dirs)))) + (and (file-directory-p (directory-file-name (car dirs))) + (file-readable-p (car dirs)))) (let ((this-dir-contents ;; Filter out "." and ".." (delq nil ------------------------------------------------------------ revno: 104898 fixes bug(s): http://debbugs.gnu.org/6289 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sun 2011-07-03 03:35:35 +0200 message: * man.el (Man-reference-regexp): Allow matching possible word-wrapped references (bug#6289). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-03 01:15:38 +0000 +++ lisp/ChangeLog 2011-07-03 01:35:35 +0000 @@ -1,5 +1,8 @@ 2011-07-03 Lars Magne Ingebrigtsen + * man.el (Man-reference-regexp): Allow matching possible + word-wrapped references (bug#6289). + * vc/vc.el (vc-modify-change-comment): Change *VC-log* to *vc-log* for consistency with the other vc buffers (bug#6197). (vc-checkin): Ditto. === modified file 'lisp/man.el' --- lisp/man.el 2011-04-08 03:30:26 +0000 +++ lisp/man.el 2011-07-03 01:35:35 +0000 @@ -276,7 +276,9 @@ This regular expression should start with a `^' character.") (defvar Man-reference-regexp - (concat "\\(" Man-name-regexp "\\)[ \t]*(\\(" Man-section-regexp "\\))") + (concat "\\(" Man-name-regexp + "\\(\n[ \t]+" Man-name-regexp "\\)*\\)[ \t]*(\\(" + Man-section-regexp "\\))") "Regular expression describing a reference to another manpage.") (defvar Man-apropos-regexp @@ -597,8 +599,8 @@ (cond ;; "chmod(2V)" case ? ((string-match (concat "^" Man-reference-regexp "$") ref) - (setq name (match-string 1 ref) - section (match-string 2 ref))) + (setq name (replace-regexp-in-string "[\n\t ]" "" (match-string 1 ref)) + section (match-string 3 ref))) ;; "2v chmod" case ? ((string-match (concat "^\\(" Man-section-regexp "\\) +\\(" Man-name-regexp "\\)$") ref) ------------------------------------------------------------ revno: 104897 fixes bug(s): http://debbugs.gnu.org/6197 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sun 2011-07-03 03:15:38 +0200 message: * vc/vc.el (vc-modify-change-comment): Change *VC-log* to *vc-log* for consistency with the other vc buffers (bug#6197). (vc-checkin): Ditto. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-03 00:59:01 +0000 +++ lisp/ChangeLog 2011-07-03 01:15:38 +0000 @@ -1,5 +1,11 @@ 2011-07-03 Lars Magne Ingebrigtsen + * vc/vc.el (vc-modify-change-comment): Change *VC-log* to *vc-log* + for consistency with the other vc buffers (bug#6197). + (vc-checkin): Ditto. + + * vc/vc-arch.el: Fix comments to match the *VC-log* name change. + * longlines.el (longlines-mode): Document what ARG does (bug#6150). 2011-07-02 Lars Magne Ingebrigtsen === modified file 'lisp/vc/vc-arch.el' --- lisp/vc/vc-arch.el 2011-01-26 08:36:39 +0000 +++ lisp/vc/vc-arch.el 2011-07-03 01:15:38 +0000 @@ -39,7 +39,7 @@ ;; Bugs: -;; - *VC-log*'s initial content lacks the `Summary:' lines. +;; - *vc-log*'s initial content lacks the `Summary:' lines. ;; - All files under the tree are considered as "under Arch's control" ;; without regards to =tagging-method and such. ;; - Files are always considered as `edited'. === modified file 'lisp/vc/vc.el' --- lisp/vc/vc.el 2011-06-26 19:34:17 +0000 +++ lisp/vc/vc.el 2011-07-03 01:15:38 +0000 @@ -620,7 +620,7 @@ ;; buffer, if one is present, instead of adding to the ChangeLog. ;; ;; - When vc-next-action calls vc-checkin it could pre-fill the -;; *VC-log* buffer with some obvious items: the list of files that +;; *vc-log* buffer with some obvious items: the list of files that ;; were added, the list of files that were removed. If the diff is ;; available, maybe it could even call something like ;; `diff-add-change-log-entries-other-window' to create a detailed @@ -1414,7 +1414,7 @@ (vc-start-logentry files comment initial-contents "Enter a change comment." - "*VC-log*" + "*vc-log*" (lambda () (vc-call-backend backend 'log-edit-mode)) (lexical-let ((rev rev)) @@ -1876,7 +1876,7 @@ (vc-start-logentry files oldcomment t "Enter a replacement change comment." - "*VC-log*" + "*vc-log*" (lambda () (vc-call-backend backend 'log-edit-mode)) (lexical-let ((rev rev)) (lambda (files comment) ------------------------------------------------------------ revno: 104896 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sun 2011-07-03 03:05:49 +0200 message: * tutorials/TUTORIAL.zh: Remove spurious ")" character on the first line. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2011-07-01 09:54:39 +0000 +++ etc/ChangeLog 2011-07-03 01:05:49 +0000 @@ -1,3 +1,8 @@ +2011-07-03 Lars Magne Ingebrigtsen + + * tutorials/TUTORIAL.zh: Remove spurious ")" character on the + first line. + 2011-07-01 Alan Mackenzie * NEWS: CC Mode: New "guessing" of style. === modified file 'etc/tutorials/TUTORIAL.zh' --- etc/tutorials/TUTORIAL.zh 2011-01-25 04:08:28 +0000 +++ etc/tutorials/TUTORIAL.zh 2011-07-03 01:05:49 +0000 @@ -1,4 +1,4 @@ -Emacs 快速指南（. +Emacs 快速指南. Emacs 指令通常包含有 CONTROL 鍵（有時候以 CTRL 或 CTL 來標示）或是 META 鍵（有時候以 EDIT 或 ALT 來標示）。為了避免每一次都要寫出其全名， ------------------------------------------------------------ revno: 104895 fixes bug(s): http://debbugs.gnu.org/6150 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sun 2011-07-03 02:59:01 +0200 message: * longlines.el (longlines-mode): Document what ARG does. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-02 23:52:35 +0000 +++ lisp/ChangeLog 2011-07-03 00:59:01 +0000 @@ -1,3 +1,7 @@ +2011-07-03 Lars Magne Ingebrigtsen + + * longlines.el (longlines-mode): Document what ARG does (bug#6150). + 2011-07-02 Lars Magne Ingebrigtsen * custom.el (defcustom): Clarify that :set is only used in the === modified file 'lisp/longlines.el' --- lisp/longlines.el 2011-04-19 13:44:55 +0000 +++ lisp/longlines.el 2011-07-03 00:59:01 +0000 @@ -95,11 +95,15 @@ ;;;###autoload (define-minor-mode longlines-mode - "Toggle Long Lines mode. + "Minor mode to wrap long lines. In Long Lines mode, long lines are wrapped if they extend beyond `fill-column'. The soft newlines used for line wrapping will not show up when the text is yanked or saved to disk. +With no argument, this command toggles Flyspell mode. +With a prefix argument ARG, turn Flyspell minor mode on if ARG is positive, +otherwise turn it off. + If the variable `longlines-auto-wrap' is non-nil, lines are automatically wrapped whenever the buffer is changed. You can always call `fill-paragraph' to fill individual paragraphs. ------------------------------------------------------------ revno: 104894 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2011-07-03 00:24:28 +0000 message: Merge changes made in Gnus trunk. gnus.el (gnus-list-debbugs): New command. gnus-group.el (gnus-bug-group-download-format-alist): Get the mboxstat instead of the maintbox, since the stat seems to be fuller. gnus-msg.el (gnus-configure-posting-styles): Don't try to select dead summary buffers. message.el (message-get-reply-headers): Delete all duplicates, instead of the first. (message-get-reply-headers): Ensure that we have progress while deleting duplicates. gnus-msg.el (gnus-configure-posting-styles): Get the local gnus-posting-style value from the summary buffer to make it easier to make that a per-buffer conf. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-07-02 23:53:45 +0000 +++ lisp/gnus/ChangeLog 2011-07-03 00:24:28 +0000 @@ -4,6 +4,25 @@ Reindent. (epg-context-operation): Remove unnecessary autoload. +2011-07-02 Lars Magne Ingebrigtsen + + * gnus.el (gnus-list-debbugs): New command. + + * gnus-group.el (gnus-bug-group-download-format-alist): Get the + mboxstat instead of the maintbox, since the stat seems to be fuller. + + * gnus-msg.el (gnus-configure-posting-styles): Don't try to select dead + summary buffers. + + * message.el (message-get-reply-headers): Delete all duplicates, + instead of the first. + (message-get-reply-headers): Ensure that we have progress while + deleting duplicates. + + * gnus-msg.el (gnus-configure-posting-styles): Get the local + gnus-posting-style value from the summary buffer to make it easier to + make that a per-buffer conf. + 2011-07-02 Andrew Cohen * nnir.el (nnir-run-imap): Allow halting a search when an article is === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2011-06-30 22:20:32 +0000 +++ lisp/gnus/gnus-group.el 2011-07-03 00:24:28 +0000 @@ -2415,7 +2415,7 @@ (gnus-read-ephemeral-gmane-group group start range))) (defcustom gnus-bug-group-download-format-alist - '((emacs . "http://debbugs.gnu.org/%s;mbox=yes;mboxmaint=yes") + '((emacs . "http://debbugs.gnu.org/%s;mboxstat=yes") (debian . "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%s&mbox=yes;mboxmaint=yes")) "Alist of symbols for bug trackers and the corresponding URL format string. === modified file 'lisp/gnus/gnus-msg.el' --- lisp/gnus/gnus-msg.el 2011-07-02 13:26:49 +0000 +++ lisp/gnus/gnus-msg.el 2011-07-03 00:24:28 +0000 @@ -1799,7 +1799,10 @@ "Configure posting styles according to `gnus-posting-styles'." (unless gnus-inhibit-posting-styles (let ((group (or group-name gnus-newsgroup-name "")) - (styles gnus-posting-styles) + (styles (if (gnus-buffer-live-p gnus-summary-buffer) + (with-current-buffer gnus-summary-buffer + gnus-posting-styles) + gnus-posting-styles)) style match attribute value v results filep name address element) ;; If the group has a posting-style parameter, add it at the end with a === modified file 'lisp/gnus/gnus.el' --- lisp/gnus/gnus.el 2011-06-28 22:18:09 +0000 +++ lisp/gnus/gnus.el 2011-07-03 00:24:28 +0000 @@ -4385,6 +4385,13 @@ (gnus-1 arg dont-connect slave) (gnus-final-warning))) +(autoload 'debbugs-emacs "debbugs-gnu") +(defun gnus-list-debbugs () + "List all open Gnus bug reports." + (interactive) + (debbugs-emacs '("important" "normal" "minor" "wishlist") + "gnus")) + ;; Allow redefinition of Gnus functions. (gnus-ems-redefine) === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2011-06-30 01:02:47 +0000 +++ lisp/gnus/message.el 2011-07-03 00:24:28 +0000 @@ -6749,10 +6749,13 @@ addr)) (cons (downcase (mail-strip-quoted-names addr)) addr))) (message-tokenize-header recipients))) - ;; Remove first duplicates. (Why not all duplicates? Is this a bug?) + ;; Remove all duplicates. (let ((s recipients)) (while s - (setq recipients (delq (assoc (car (pop s)) s) recipients)))) + (let ((address (car (pop s)))) + (while (assoc address s) + (setq recipients (delq (assoc address s) recipients) + s (delq (assoc address s) s)))))) ;; Remove hierarchical lists that are contained within each other, ;; if message-hierarchical-addresses is defined. ------------------------------------------------------------ revno: 104893 committer: Daiki Ueno branch nick: trunk timestamp: Sun 2011-07-03 08:53:45 +0900 message: Style fixes for auth-source.el. * auth-source.el (auth-source-token-passphrase-callback-function): Reindent. (epg-context-operation): Remove unnecessary autoload. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-07-02 13:26:49 +0000 +++ lisp/gnus/ChangeLog 2011-07-02 23:53:45 +0000 @@ -1,3 +1,9 @@ +2011-07-02 Daiki Ueno + + * auth-source.el (auth-source-token-passphrase-callback-function): + Reindent. + (epg-context-operation): Remove unnecessary autoload. + 2011-07-02 Andrew Cohen * nnir.el (nnir-run-imap): Allow halting a search when an article is === modified file 'lisp/gnus/auth-source.el' --- lisp/gnus/auth-source.el 2011-07-01 14:05:59 +0000 +++ lisp/gnus/auth-source.el 2011-07-02 23:53:45 +0000 @@ -74,7 +74,6 @@ (autoload 'plstore-save "plstore") (autoload 'plstore-get-file "plstore") -(autoload 'epg-context-operation "epg") (autoload 'epg-make-context "epg") (autoload 'epg-context-set-passphrase-callback "epg") (autoload 'epg-decrypt-string "epg") @@ -1005,24 +1004,24 @@ (defvar auth-source-passphrase-alist nil) (defun auth-source-token-passphrase-callback-function (context key-id file) - (let* ((file (file-truename file)) - (entry (assoc file auth-source-passphrase-alist)) - passphrase) - ;; return the saved passphrase, calling a function if needed - (or (copy-sequence (if (functionp (cdr entry)) - (funcall (cdr entry)) - (cdr entry))) - (progn - (unless entry - (setq entry (list file)) - (push entry auth-source-passphrase-alist)) - (setq passphrase - (read-passwd - (format "Passphrase for %s tokens: " file) - t)) - (setcdr entry (lexical-let ((p (copy-sequence passphrase))) - (lambda () p))) - passphrase)))) + (let* ((file (file-truename file)) + (entry (assoc file auth-source-passphrase-alist)) + passphrase) + ;; return the saved passphrase, calling a function if needed + (or (copy-sequence (if (functionp (cdr entry)) + (funcall (cdr entry)) + (cdr entry))) + (progn + (unless entry + (setq entry (list file)) + (push entry auth-source-passphrase-alist)) + (setq passphrase + (read-passwd + (format "Passphrase for %s tokens: " file) + t)) + (setcdr entry (lexical-let ((p (copy-sequence passphrase))) + (lambda () p))) + passphrase)))) ;; (auth-source-epa-extract-gpg-token "gpg:LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tClZlcnNpb246IEdudVBHIHYxLjQuMTEgKEdOVS9MaW51eCkKCmpBMEVBd01DT25qMjB1ak9rZnRneVI3K21iNm9aZWhuLzRad3cySkdlbnVaKzRpeEswWDY5di9icDI1U1dsQT0KPS9yc2wKLS0tLS1FTkQgUEdQIE1FU1NBR0UtLS0tLQo=" "~/.netrc") (defun auth-source-epa-extract-gpg-token (secret file) ------------------------------------------------------------ revno: 104892 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sun 2011-07-03 01:52:35 +0200 message: Clarify that SETFUNCTION is only used in the Customize user interface (bug#6089). diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-07-02 21:38:52 +0000 +++ doc/lispref/ChangeLog 2011-07-02 23:52:35 +0000 @@ -1,5 +1,8 @@ 2011-07-02 Lars Magne Ingebrigtsen + * customize.texi (Variable Definitions): Clarify that SETFUNCTION + is only used in the Customize user interface (bug#6089). + * display.texi (Showing Images): Mention the point of sliced images (bug#7836). === modified file 'doc/lispref/customize.texi' --- doc/lispref/customize.texi 2011-07-02 13:36:11 +0000 +++ doc/lispref/customize.texi 2011-07-02 23:52:35 +0000 @@ -326,11 +326,12 @@ @item :set @var{setfunction} @kindex set@r{, @code{defcustom} keyword} Specify @var{setfunction} as the way to change the value of this -option. The function @var{setfunction} should take two arguments, a -symbol (the option name) and the new value, and should do whatever is -necessary to update the value properly for this option (which may not -mean simply setting the option as a Lisp variable). The default for -@var{setfunction} is @code{set-default}. +option when using the Customize user interface. The function +@var{setfunction} should take two arguments, a symbol (the option +name) and the new value, and should do whatever is necessary to update +the value properly for this option (which may not mean simply setting +the option as a Lisp variable). The default for @var{setfunction} is +@code{set-default}. @item :get @var{getfunction} @kindex get@r{, @code{defcustom} keyword} === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-02 22:55:41 +0000 +++ lisp/ChangeLog 2011-07-02 23:52:35 +0000 @@ -1,5 +1,8 @@ 2011-07-02 Lars Magne Ingebrigtsen + * custom.el (defcustom): Clarify that :set is only used in the + Customize user interface (bug#6089). + * progmodes/flymake.el (flymake-mode): If the buffer isn't associated with a file, refuse to run instead of erroring out (bug#6084). === modified file 'lisp/custom.el' --- lisp/custom.el 2011-06-30 01:39:52 +0000 +++ lisp/custom.el 2011-07-02 23:52:35 +0000 @@ -215,7 +215,8 @@ variable. It takes two arguments, the symbol and value given in the `defcustom' call. The default is `custom-initialize-reset'. -:set VALUE should be a function to set the value of the symbol. +:set VALUE should be a function to set the value of the symbol + when using the Customize user interface. It takes two arguments, the symbol to set and the value to give it. The default choice of function is `set-default'. :get VALUE should be a function to extract the value of symbol. ------------------------------------------------------------ revno: 104891 committer: Chong Yidong branch nick: trunk timestamp: Sat 2011-07-02 19:40:04 -0400 message: Fix corner case in prefix-arg handling for mouse events (Bug#1586). * src/keyboard.c (command_loop_1): If a down-mouse event is unbound, leave any prefix arg for the up event. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-02 16:18:24 +0000 +++ src/ChangeLog 2011-07-02 23:40:04 +0000 @@ -1,3 +1,8 @@ +2011-07-02 Chong Yidong + + * keyboard.c (command_loop_1): If a down-mouse event is unbound, + leave any prefix arg for the up event (Bug#1586). + 2011-07-02 Lars Magne Ingebrigtsen * lread.c (syms_of_lread): Mention single symbols defined by === modified file 'src/keyboard.c' --- src/keyboard.c 2011-07-02 04:27:41 +0000 +++ src/keyboard.c 2011-07-02 23:40:04 +0000 @@ -1539,7 +1539,18 @@ message_with_string ("%s is undefined", keys, 0); KVAR (current_kboard, defining_kbd_macro) = Qnil; update_mode_lines = 1; - KVAR (current_kboard, Vprefix_arg) = Qnil; + /* If this is a down-mouse event, don't reset prefix-arg; + pass it to the command run by the up event. */ + if (EVENT_HAS_PARAMETERS (last_command_event)) + { + Lisp_Object breakdown + = parse_modifiers (EVENT_HEAD (last_command_event)); + int modifiers = XINT (XCAR (XCDR (breakdown))); + if (!(modifiers & down_modifier)) + KVAR (current_kboard, Vprefix_arg) = Qnil; + } + else + KVAR (current_kboard, Vprefix_arg) = Qnil; } else { ------------------------------------------------------------ revno: 104890 fixes bug(s): http://debbugs.gnu.org/6084 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sun 2011-07-03 00:55:41 +0200 message: * progmodes/flymake.el (flymake-mode): If the buffer isn't associated with a file, refuse to run instead of erroring out (bug#6084). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-02 21:42:49 +0000 +++ lisp/ChangeLog 2011-07-02 22:55:41 +0000 @@ -1,5 +1,9 @@ 2011-07-02 Lars Magne Ingebrigtsen + * progmodes/flymake.el (flymake-mode): If the buffer isn't + associated with a file, refuse to run instead of erroring out + (bug#6084). + * textmodes/fill.el (fill-region): Remove the "Ordinarily" from the doc string, since it appears that using `fill-column' always controls the width (bug#7845). === modified file 'lisp/progmodes/flymake.el' --- lisp/progmodes/flymake.el 2011-07-01 10:33:50 +0000 +++ lisp/progmodes/flymake.el 2011-07-02 22:55:41 +0000 @@ -1339,8 +1339,12 @@ ;; Turning the mode ON. (flymake-mode - (if (not (flymake-can-syntax-check-file buffer-file-name)) - (flymake-log 2 "flymake cannot check syntax in buffer %s" (buffer-name)) + (cond + ((not buffer-file-name) + (message "Flymake unable to run without a buffer file name")) + ((not (flymake-can-syntax-check-file buffer-file-name)) + (flymake-log 2 "flymake cannot check syntax in buffer %s" (buffer-name))) + (t (add-hook 'after-change-functions 'flymake-after-change-function nil t) (add-hook 'after-save-hook 'flymake-after-save-hook nil t) (add-hook 'kill-buffer-hook 'flymake-kill-buffer-hook nil t) @@ -1352,7 +1356,7 @@ (run-at-time nil 1 'flymake-on-timer-event (current-buffer))) (when flymake-start-syntax-check-on-find-file - (flymake-start-syntax-check)))) + (flymake-start-syntax-check))))) ;; Turning the mode OFF. (t ------------------------------------------------------------ revno: 104889 fixes bug(s): http://debbugs.gnu.org/7845 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 23:42:49 +0200 message: * textmodes/fill.el (fill-region): Remove the "Ordinarily" from the doc string, since it appears that using `fill-column' always controls the width (bug#7845). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-02 20:59:18 +0000 +++ lisp/ChangeLog 2011-07-02 21:42:49 +0000 @@ -1,5 +1,9 @@ 2011-07-02 Lars Magne Ingebrigtsen + * textmodes/fill.el (fill-region): Remove the "Ordinarily" from + the doc string, since it appears that using `fill-column' always + controls the width (bug#7845). + * simple.el (shell-command-on-region): Say where the error output went if `shell-command-default-error-buffer' is set (bug#6857). === modified file 'lisp/textmodes/fill.el' --- lisp/textmodes/fill.el 2011-06-25 18:21:00 +0000 +++ lisp/textmodes/fill.el 2011-07-02 21:42:49 +0000 @@ -988,7 +988,7 @@ (defun fill-region (from to &optional justify nosqueeze to-eop) "Fill each of the paragraphs in the region. A prefix arg means justify as well. -Ordinarily the variable `fill-column' controls the width. +The `fill-column' variable controls the width. Noninteractively, the third argument JUSTIFY specifies which kind of justification to do: `full', `left', `right', `center', ------------------------------------------------------------ revno: 104888 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 23:38:52 +0200 message: Typo fix. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-07-02 21:38:19 +0000 +++ doc/lispref/ChangeLog 2011-07-02 21:38:52 +0000 @@ -1,7 +1,7 @@ 2011-07-02 Lars Magne Ingebrigtsen * display.texi (Showing Images): Mention the point of sliced - images (bug bug#7836). + images (bug#7836). 2011-07-02 Eli Zaretskii ------------------------------------------------------------ revno: 104887 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 23:38:19 +0200 message: * display.texi (Showing Images): Mention the point of sliced images (bug bug#7836). diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-07-02 17:18:16 +0000 +++ doc/lispref/ChangeLog 2011-07-02 21:38:19 +0000 @@ -1,3 +1,8 @@ +2011-07-02 Lars Magne Ingebrigtsen + + * display.texi (Showing Images): Mention the point of sliced + images (bug bug#7836). + 2011-07-02 Eli Zaretskii * variables.texi (Defining Variables, Void Variables) === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2011-06-25 18:21:00 +0000 +++ doc/lispref/display.texi 2011-07-02 21:38:19 +0000 @@ -4700,10 +4700,17 @@ Property}. @end defun +@cindex slice, image +@cindex image slice @defun insert-sliced-image image &optional string area rows cols This function inserts @var{image} in the current buffer at point, like @code{insert-image}, but splits the image into @var{rows}x@var{cols} equally sized slices. + +If an image is inserted ``sliced'', then the Emacs display engine will +treat each slice as a separate image, and allow more intuitive +scrolling up/down, instead of jumping up/down the entire image when +paging through a buffer that displays (large) images. @end defun @defun put-image image pos &optional string area ------------------------------------------------------------ revno: 104886 fixes bug(s): http://debbugs.gnu.org/6857 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 22:59:18 +0200 message: * simple.el (shell-command-on-region): Say where the error output went if `shell-command-default-error-buffer' is set. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-02 17:39:41 +0000 +++ lisp/ChangeLog 2011-07-02 20:59:18 +0000 @@ -1,3 +1,8 @@ +2011-07-02 Lars Magne Ingebrigtsen + + * simple.el (shell-command-on-region): Say where the error output + went if `shell-command-default-error-buffer' is set (bug#6857). + 2011-07-02 Ken Manheimer * allout.el (allout-yank-processing): Adjust cursor position for === modified file 'lisp/simple.el' --- lisp/simple.el 2011-06-11 09:50:37 +0000 +++ lisp/simple.el 2011-07-02 20:59:18 +0000 @@ -2531,7 +2531,10 @@ (let ((output (if (and error-file (< 0 (nth 7 (file-attributes error-file)))) - "some error output" + (format "some error output%s" + (if shell-command-default-error-buffer + (format " to the \"%s\" buffer" shell-command-default-error-buffer) + "")) "no output"))) (cond ((null exit-status) (message "(Shell command failed with error)")) ------------------------------------------------------------ revno: 104885 committer: Ken Manheimer branch nick: trunk timestamp: Sat 2011-07-02 13:39:41 -0400 message: * allout.el (allout-yank-processing): Adjust cursor position for backwards-deleted space. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-02 16:07:30 +0000 +++ lisp/ChangeLog 2011-07-02 17:39:41 +0000 @@ -1,3 +1,12 @@ +2011-07-02 Ken Manheimer + + * allout.el (allout-yank-processing): Adjust cursor position for + backwards-deleted space. + + (allout-rebullet-heading): Register changes with + allout-exposure-changed-hook, so the modified topic is properly + decorated. + 2011-07-02 Lars Magne Ingebrigtsen * minibuffer.el (completion-in-region): Document PREDICATE === modified file 'lisp/allout.el' --- lisp/allout.el 2011-06-30 14:38:35 +0000 +++ lisp/allout.el 2011-07-02 17:39:41 +0000 @@ -4036,6 +4036,8 @@ (not (allout-encrypted-topic-p))) (allout-reindent-body current-depth new-depth)) + (run-hook-with-args 'allout-exposure-change-hook mb me nil) + ;; Recursively rectify successive siblings of orig topic if ;; caller elected for it: (if do-successors @@ -4605,7 +4607,9 @@ ; and delete residual subj ; prefix digits and space: (while (looking-at "[0-9]") (delete-char 1)) - (delete-char -1))) + (delete-char -1) + (if (not (eolp)) + (forward-char)))) ;; Assert new topic's bullet - minimal effort if unchanged: (allout-rebullet-heading (string-to-char prefix-bullet))) (exchange-point-and-mark)))) ------------------------------------------------------------ revno: 104884 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2011-07-02 20:18:16 +0300 message: Fix incorrect usage of @kindex. doc/lispref/variables.texi (Defining Variables, Void Variables) (Constant Variables): Fix incorrect usage of @kindex. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-07-02 17:10:29 +0000 +++ doc/lispref/ChangeLog 2011-07-02 17:18:16 +0000 @@ -1,3 +1,8 @@ +2011-07-02 Eli Zaretskii + + * variables.texi (Defining Variables, Void Variables) + (Constant Variables): Fix incorrect usage of @kindex. + 2011-07-02 Lars Magne Ingebrigtsen * variables.texi (Defining Variables): Add an index entry for === modified file 'doc/lispref/variables.texi' --- doc/lispref/variables.texi 2011-07-02 17:10:29 +0000 +++ doc/lispref/variables.texi 2011-07-02 17:18:16 +0000 @@ -99,7 +99,7 @@ @node Constant Variables @section Variables that Never Change -@kindex setting-constant +@cindex @code{setting-constant} error @cindex keyword symbol @cindex variable with constant value @cindex constant variables @@ -288,7 +288,7 @@ @node Void Variables @section When a Variable is ``Void'' -@kindex void-variable +@cindex @code{void-variable} error @cindex void variable If you have never given a symbol any value as a global variable, we @@ -583,7 +583,7 @@ is a user option. Aliases of user options are also user options. @end defun -@kindex variable-interactive +@cindex @code{variable-interactive} property @findex set-variable If a user option variable has a @code{variable-interactive} property, the @code{set-variable} command uses that value to control reading the ------------------------------------------------------------ revno: 104883 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 19:10:29 +0200 message: (Defining Variables): Use @findex for functions. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-07-02 15:32:03 +0000 +++ doc/lispref/ChangeLog 2011-07-02 17:10:29 +0000 @@ -2,6 +2,7 @@ * variables.texi (Defining Variables): Add an index entry for `set-variable' (bug#7262). + (Defining Variables): Use @findex for functions. * frames.texi (Basic Parameters): Document the `explicit-name' parameter (bug#6951). === modified file 'doc/lispref/variables.texi' --- doc/lispref/variables.texi 2011-07-02 16:20:15 +0000 +++ doc/lispref/variables.texi 2011-07-02 17:10:29 +0000 @@ -584,7 +584,7 @@ @end defun @kindex variable-interactive -@kindex set-variable +@findex set-variable If a user option variable has a @code{variable-interactive} property, the @code{set-variable} command uses that value to control reading the new value for the variable. The property's value is used as if it were ------------------------------------------------------------ revno: 104882 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 18:20:15 +0200 message: Remove spurious newline introduced by last checkin. diff: === modified file 'doc/lispref/variables.texi' --- doc/lispref/variables.texi 2011-07-02 15:32:03 +0000 +++ doc/lispref/variables.texi 2011-07-02 16:20:15 +0000 @@ -466,7 +466,6 @@ stored in the symbol's @code{variable-documentation} property. The Emacs help functions (@pxref{Documentation}) look for this property. - If the documentation string begins with the character @samp{*}, Emacs allows users to set it interactively using the @code{set-variable} command. However, you should nearly always use @code{defcustom} ------------------------------------------------------------ revno: 104881 fixes bug(s): http://debbugs.gnu.org/7154 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 18:18:24 +0200 message: * lread.c (syms_of_lread): Mention single symbols defined by `defvar' or `defconst' (bug#7154). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-02 14:34:45 +0000 +++ src/ChangeLog 2011-07-02 16:18:24 +0000 @@ -1,5 +1,8 @@ 2011-07-02 Lars Magne Ingebrigtsen + * lread.c (syms_of_lread): Mention single symbols defined by + `defvar' or `defconst' (bug#7154). + * fns.c (Frequire): Mention .el.gz files (bug#7314). (Frequire): Mention get-load-suffixes. === modified file 'src/lread.c' --- src/lread.c 2011-06-24 21:25:22 +0000 +++ src/lread.c 2011-07-02 16:18:24 +0000 @@ -4420,9 +4420,11 @@ variables defined in that file, the features provided, and the features required. Each entry has the form `(provide . FEATURE)', `(require . FEATURE)', `(defun . FUNCTION)', `(autoload . SYMBOL)', -`(defface . SYMBOL)', or `(t . SYMBOL)'. In addition, an entry `(t -. SYMBOL)' may precede an entry `(defun . FUNCTION)', and means that -SYMBOL was an autoload before this file redefined it as a function. +`(defface . SYMBOL)', or `(t . SYMBOL)'. Entries like `(t . SYMBOL)' +may precede a `(defun . FUNCTION)' entry, and means that SYMBOL was an +autoload before this file redefined it as a function. In addition, +entries may also be single symbols, which means that SYMBOL was +defined by `defvar' or `defconst'. During preloading, the file name recorded is relative to the main Lisp directory. These file names are converted to absolute at startup. */); ------------------------------------------------------------ revno: 104880 fixes bug(s): http://debbugs.gnu.org/7136 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 18:07:30 +0200 message: * minibuffer.el (completion-in-region): Document PREDICATE (bug#7136). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-02 14:05:38 +0000 +++ lisp/ChangeLog 2011-07-02 16:07:30 +0000 @@ -1,5 +1,8 @@ 2011-07-02 Lars Magne Ingebrigtsen + * minibuffer.el (completion-in-region): Document PREDICATE + (bug#7136). + * info-look.el (info-lookup-add-help): Clarify that ARGS is a list of keyword/argument pairs (bug#6904). === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2011-07-02 04:27:41 +0000 +++ lisp/minibuffer.el 2011-07-02 16:07:30 +0000 @@ -1442,7 +1442,9 @@ (defun completion-in-region (start end collection &optional predicate) "Complete the text between START and END using COLLECTION. Return nil if there is no valid completion, else t. -Point needs to be somewhere between START and END." +Point needs to be somewhere between START and END. +PREDICATE (a function called with no arguments) says when to +exit." (assert (<= start (point)) (<= (point) end)) (with-wrapper-hook ;; FIXME: Maybe we should use this hook to provide a "display ------------------------------------------------------------ revno: 104879 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 17:43:04 +0200 message: Typo fix. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-07-02 15:42:37 +0000 +++ doc/emacs/ChangeLog 2011-07-02 15:43:04 +0000 @@ -1,6 +1,6 @@ 2011-07-02 Lars Magne Ingebrigtsen - * dired.texi (Subdirectories in Dired): Clarify the `C-u k' + * dired.texi (Subdirectories in Dired): Clarify that `C-u k' doesn't actually delete any files (bug#7125). * picture-xtra.texi (Rectangles in Picture): Clarify the prefix ------------------------------------------------------------ revno: 104878 fixes bug(s): http://debbugs.gnu.org/7125 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 17:42:37 +0200 message: * dired.texi (Subdirectories in Dired): Clarify the `C-u k' doesn't actually delete any files (bug#7125). diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-07-02 13:40:21 +0000 +++ doc/emacs/ChangeLog 2011-07-02 15:42:37 +0000 @@ -1,5 +1,8 @@ 2011-07-02 Lars Magne Ingebrigtsen + * dired.texi (Subdirectories in Dired): Clarify the `C-u k' + doesn't actually delete any files (bug#7125). + * picture-xtra.texi (Rectangles in Picture): Clarify the prefix argument for `C-c C-k' (bug#7391). === modified file 'doc/emacs/dired.texi' --- doc/emacs/dired.texi 2011-02-19 19:40:59 +0000 +++ doc/emacs/dired.texi 2011-07-02 15:42:37 +0000 @@ -984,8 +984,9 @@ Use the @kbd{l} command (@code{dired-do-redisplay}) to update the subdirectory's contents. Use @kbd{C-u k} on the subdirectory header -line to delete the subdirectory (@pxref{Dired Updating}). You can also -hide and show inserted subdirectories (@pxref{Hiding Subdirectories}). +line to remove the subdirectory listing (@pxref{Dired Updating}). You +can also hide and show inserted subdirectories (@pxref{Hiding +Subdirectories}). @ifnottex @include dired-xtra.texi @@ -1145,9 +1146,9 @@ If you use @kbd{k} with a numeric prefix argument to kill the line for a file that is a directory, which you have inserted in the Dired -buffer as a subdirectory, it deletes that subdirectory from the buffer -as well. Typing @kbd{C-u k} on the header line for a subdirectory -also deletes the subdirectory from the Dired buffer. +buffer as a subdirectory, it removed that subdirectory line from the +buffer as well. Typing @kbd{C-u k} on the header line for a +subdirectory also removes the subdirectory line from the Dired buffer. The @kbd{g} command brings back any individual lines that you have killed in this way, but not subdirectories---you must use @kbd{i} to ------------------------------------------------------------ revno: 104877 fixes bug(s): http://debbugs.gnu.org/7262 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 17:32:03 +0200 message: * variables.texi (Defining Variables): Add an index entry for `set-variable' (bug#7262). diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-07-02 14:14:57 +0000 +++ doc/lispref/ChangeLog 2011-07-02 15:32:03 +0000 @@ -1,5 +1,8 @@ 2011-07-02 Lars Magne Ingebrigtsen + * variables.texi (Defining Variables): Add an index entry for + `set-variable' (bug#7262). + * frames.texi (Basic Parameters): Document the `explicit-name' parameter (bug#6951). === modified file 'doc/lispref/variables.texi' --- doc/lispref/variables.texi 2011-05-26 16:20:21 +0000 +++ doc/lispref/variables.texi 2011-07-02 15:32:03 +0000 @@ -466,6 +466,7 @@ stored in the symbol's @code{variable-documentation} property. The Emacs help functions (@pxref{Documentation}) look for this property. + If the documentation string begins with the character @samp{*}, Emacs allows users to set it interactively using the @code{set-variable} command. However, you should nearly always use @code{defcustom} @@ -584,6 +585,7 @@ @end defun @kindex variable-interactive +@kindex set-variable If a user option variable has a @code{variable-interactive} property, the @code{set-variable} command uses that value to control reading the new value for the variable. The property's value is used as if it were ------------------------------------------------------------ revno: 104876 fixes bug(s): http://debbugs.gnu.org/5486 committer: Jason Rumney branch nick: trunk timestamp: Sat 2011-07-02 23:07:57 +0800 message: * lib-src/emacsclient.c (decode_options) [WINDOWSNT]: Avoid tty mode on Windows. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2011-06-25 18:13:14 +0000 +++ lib-src/ChangeLog 2011-07-02 15:07:57 +0000 @@ -1,3 +1,8 @@ +2011-07-02 Jason Rumney + + * emacsclient.c (decode_options) [WINDOWSNT]: Avoid tty mode on + Windows (Bug#5486). + 2011-06-25 Glenn Morris * emacsclient.c (decode_options) : Add `F:'. === modified file 'lib-src/emacsclient.c' --- lib-src/emacsclient.c 2011-06-25 19:52:34 +0000 +++ lib-src/emacsclient.c 2011-07-02 15:07:57 +0000 @@ -652,6 +652,14 @@ an empty string"); exit (EXIT_FAILURE); } + + /* TTY frames not supported on Windows. Continue using GUI rather than + forcing the user to change their command-line. This is required since + tty is set above if certain options are given and $DISPLAY is not set, + which is not obvious to users. */ + if (tty) + tty = 0; + #endif /* WINDOWSNT */ } ------------------------------------------------------------ revno: 104875 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 16:34:45 +0200 message: (Frequire): Mention get-load-suffixes. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-02 14:30:52 +0000 +++ src/ChangeLog 2011-07-02 14:34:45 +0000 @@ -1,6 +1,7 @@ 2011-07-02 Lars Magne Ingebrigtsen * fns.c (Frequire): Mention .el.gz files (bug#7314). + (Frequire): Mention get-load-suffixes. 2011-07-02 Martin Rudalics === modified file 'src/fns.c' --- src/fns.c 2011-07-02 14:30:52 +0000 +++ src/fns.c 2011-07-02 14:34:45 +0000 @@ -2613,7 +2613,8 @@ If FILENAME is omitted, the printname of FEATURE is used as the file name, and `load' will try to load this name appended with the suffix `.elc' or `.el', in that order. The name without appended suffix will not be used. -If your system supports it, `.el.gz' files will also be considered. +If your system supports it, `.elc.gz' and `.el.gz' files will also be +considered. See `get-load-suffixes' for the complete list of suffixes. If the optional third argument NOERROR is non-nil, then return nil if the file is not found instead of signaling an error. Normally the return value is FEATURE. ------------------------------------------------------------ revno: 104874 fixes bug(s): http://debbugs.gnu.org/7314 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 16:30:52 +0200 message: * fns.c (Frequire): Mention .el.gz files. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-02 10:36:48 +0000 +++ src/ChangeLog 2011-07-02 14:30:52 +0000 @@ -1,3 +1,7 @@ +2011-07-02 Lars Magne Ingebrigtsen + + * fns.c (Frequire): Mention .el.gz files (bug#7314). + 2011-07-02 Martin Rudalics * window.h (window): Remove clone_number slot. === modified file 'src/fns.c' --- src/fns.c 2011-06-24 21:25:22 +0000 +++ src/fns.c 2011-07-02 14:30:52 +0000 @@ -2613,6 +2613,7 @@ If FILENAME is omitted, the printname of FEATURE is used as the file name, and `load' will try to load this name appended with the suffix `.elc' or `.el', in that order. The name without appended suffix will not be used. +If your system supports it, `.el.gz' files will also be considered. If the optional third argument NOERROR is non-nil, then return nil if the file is not found instead of signaling an error. Normally the return value is FEATURE. ------------------------------------------------------------ revno: 104873 fixes bug(s): http://debbugs.gnu.org/6951 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 16:14:57 +0200 message: * frames.texi (Basic Parameters): Document the `explicit-name' parameter (bug#6951). diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-07-02 13:36:11 +0000 +++ doc/lispref/ChangeLog 2011-07-02 14:14:57 +0000 @@ -1,5 +1,8 @@ 2011-07-02 Lars Magne Ingebrigtsen + * frames.texi (Basic Parameters): Document the `explicit-name' + parameter (bug#6951). + * customize.texi (Type Keywords): Clarify that :value provides a default value for all types (bug#7386). === modified file 'doc/lispref/frames.texi' --- doc/lispref/frames.texi 2011-05-19 06:54:27 +0000 +++ doc/lispref/frames.texi 2011-07-02 14:14:57 +0000 @@ -520,6 +520,11 @@ If you specify the frame name explicitly when you create the frame, the name is also used (instead of the name of the Emacs executable) when looking up X resources for the frame. + +@item explicit-name +If the frame name was specified explicitly when the frame was created, +this parameter will be that name. If the frame wasn't explicitly +named, this parameter will be @code{nil}. @end table @node Position Parameters ------------------------------------------------------------ revno: 104872 fixes bug(s): http://debbugs.gnu.org/6904 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 16:05:38 +0200 message: * info-look.el (info-lookup-add-help): Clarify that ARGS is a list of keyword/argument pairs (bug#6904). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-02 13:53:53 +0000 +++ lisp/ChangeLog 2011-07-02 14:05:38 +0000 @@ -1,5 +1,8 @@ 2011-07-02 Lars Magne Ingebrigtsen + * info-look.el (info-lookup-add-help): Clarify that ARGS is a list + of keyword/argument pairs (bug#6904). + * replace.el (multi-occur): Mention `multi-occur-in-matching-buffers' in the doc string (bug#7566). === modified file 'lisp/info-look.el' --- lisp/info-look.el 2011-05-28 02:10:32 +0000 +++ lisp/info-look.el 2011-07-02 14:05:38 +0000 @@ -127,9 +127,9 @@ (defun info-lookup-add-help (&rest arg) "Add or update a help specification. -Function arguments are one or more options of the form +Function arguments are specified as keyword/argument pairs: - KEYWORD ARGUMENT + \(KEYWORD . ARGUMENT) KEYWORD is either `:topic', `:mode', `:regexp', `:ignore-case', `:doc-spec', `:parse-rule', or `:other-modes'. ------------------------------------------------------------ revno: 104871 fixes bug(s): http://debbugs.gnu.org/7566 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 15:53:53 +0200 message: * replace.el (multi-occur): Mention `multi-occur-in-matching-buffers' in the doc string. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-02 13:28:19 +0000 +++ lisp/ChangeLog 2011-07-02 13:53:53 +0000 @@ -1,3 +1,8 @@ +2011-07-02 Lars Magne Ingebrigtsen + + * replace.el (multi-occur): Mention + `multi-occur-in-matching-buffers' in the doc string (bug#7566). + 2011-07-02 Drew Adams * dired.el (dired-mark-if): Make the message about whether it's === modified file 'lisp/replace.el' --- lisp/replace.el 2011-05-28 22:56:14 +0000 +++ lisp/replace.el 2011-07-02 13:53:53 +0000 @@ -1140,7 +1140,8 @@ "Show all lines in buffers BUFS containing a match for REGEXP. This function acts on multiple buffers; otherwise, it is exactly like `occur'. When you invoke this command interactively, you must specify -the buffer names that you want, one by one." +the buffer names that you want, one by one. +See also `multi-occur-in-matching-buffers'." (interactive (cons (let* ((bufs (list (read-buffer "First buffer to search: " ------------------------------------------------------------ revno: 104870 fixes bug(s): http://debbugs.gnu.org/7391 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 15:40:21 +0200 message: * picture-xtra.texi (Rectangles in Picture): Clarify the prefix argument for `C-c C-k' (bug#7391). diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-07-02 13:17:06 +0000 +++ doc/emacs/ChangeLog 2011-07-02 13:40:21 +0000 @@ -1,5 +1,8 @@ 2011-07-02 Lars Magne Ingebrigtsen + * picture-xtra.texi (Rectangles in Picture): Clarify the prefix + argument for `C-c C-k' (bug#7391). + * frames.texi (Fonts): Mention "C-u C-x =" to find out what font you're currently using (bug#8489). === modified file 'doc/emacs/picture-xtra.texi' --- doc/emacs/picture-xtra.texi 2011-01-25 04:08:28 +0000 +++ doc/emacs/picture-xtra.texi 2011-07-02 13:40:21 +0000 @@ -245,7 +245,8 @@ @table @kbd @item C-c C-k Clear out the region-rectangle with spaces -(@code{picture-clear-rectangle}). With argument, delete the text. +(@code{picture-clear-rectangle}). With a prefix argument, delete the +text. @item C-c C-w @var{r} Similar, but save rectangle contents in register @var{r} first (@code{picture-clear-rectangle-to-register}). ------------------------------------------------------------ revno: 104869 fixes bug(s): http://debbugs.gnu.org/7386 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 15:36:11 +0200 message: * customize.texi (Type Keywords): Clarify that :value provides a default value for all types. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-07-02 13:08:07 +0000 +++ doc/lispref/ChangeLog 2011-07-02 13:36:11 +0000 @@ -1,5 +1,8 @@ 2011-07-02 Lars Magne Ingebrigtsen + * customize.texi (Type Keywords): Clarify that :value provides a + default value for all types (bug#7386). + * streams.texi (Output Functions): Document `pp'. 2011-06-25 Chong Yidong === modified file 'doc/lispref/customize.texi' --- doc/lispref/customize.texi 2011-05-19 06:54:27 +0000 +++ doc/lispref/customize.texi 2011-07-02 13:36:11 +0000 @@ -1035,7 +1035,12 @@ @table @code @item :value @var{default} -This is used for a type that appears as an alternative inside of +Provide a default value. + +If @code{nil} is not a valid value for the alternative, then it is +essential to specify a valid default with @code{:value}. + +If you use this for a type that appears as an alternative inside of @code{choice}; it specifies the default value to use, at first, if and when the user selects this alternative with the menu in the customization buffer. @@ -1043,9 +1048,6 @@ Of course, if the actual value of the option fits this alternative, it will appear showing the actual value, not @var{default}. -If @code{nil} is not a valid value for the alternative, then it is -essential to specify a valid default with @code{:value}. - @item :format @var{format-string} @kindex format@r{, customization keyword} This string will be inserted in the buffer to represent the value ------------------------------------------------------------ revno: 104868 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 15:28:19 +0200 message: (dired-mark-if): Make the message about whether it's marking or unmarking clearer (bug#8523) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-02 12:27:53 +0000 +++ lisp/ChangeLog 2011-07-02 13:28:19 +0000 @@ -1,3 +1,8 @@ +2011-07-02 Drew Adams + + * dired.el (dired-mark-if): Make the message about whether it's + marking or unmarking clearer (bug#8523). + 2011-07-02 Lars Magne Ingebrigtsen * disp-table.el (display-table-print-array): New function. === modified file 'lisp/dired.el' --- lisp/dired.el 2011-07-02 10:23:45 +0000 +++ lisp/dired.el 2011-07-02 13:28:19 +0000 @@ -485,7 +485,16 @@ `(let ((inhibit-read-only t) count) (save-excursion (setq count 0) - (if ,msg (message "Marking %ss..." ,msg)) + (when ,msg + (message "%s %ss%s..." + (cond ((eq dired-marker-char ?\040) "Unmarking") + ((eq dired-del-marker dired-marker-char) + "Flagging") + (t "Marking")) + ,msg + (if (eq dired-del-marker dired-marker-char) + " for deletion" + ""))) (goto-char (point-min)) (while (not (eobp)) (if ,predicate ------------------------------------------------------------ revno: 104867 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Sat 2011-07-02 13:26:49 +0000 message: Merge changes made in Gnus trunk. nnir.el (nnir-run-imap): Allow halting a search when an article is found by setting `shortcut' in 'query. (nnir-request-article): Use `shortcut' setting when requesting article by Message-ID. gnus-msg.el (gnus-bug): Give the Version and Package headers to debbugs with the X-Debbugs-Package and X-Debbugs-Version headers. Bring the pseudo-headers back too. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-07-01 14:05:59 +0000 +++ lisp/gnus/ChangeLog 2011-07-02 13:26:49 +0000 @@ -1,3 +1,16 @@ +2011-07-02 Andrew Cohen + + * nnir.el (nnir-run-imap): Allow halting a search when an article is + found by setting `shortcut' in 'query. + (nnir-request-article): Use `shortcut' setting when requesting article + by Message-ID. + +2011-07-02 Teodor Zlatanov + + * gnus-msg.el (gnus-bug): Give the Version and Package headers to + debbugs with the X-Debbugs-Package and X-Debbugs-Version headers. + Bring the pseudo-headers back too. + 2011-07-01 Daiki Ueno * auth-source.el (auth-source-token-passphrase-callback-function): === modified file 'lisp/gnus/gnus-msg.el' --- lisp/gnus/gnus-msg.el 2011-06-28 22:18:09 +0000 +++ lisp/gnus/gnus-msg.el 2011-07-02 13:26:49 +0000 @@ -1455,7 +1455,12 @@ (goto-char (point-min))) (message-pop-to-buffer "*Gnus Bug*")) (let ((message-this-is-mail t)) - (message-setup `((To . ,gnus-maintainer) (Subject . "")))) + (message-setup `((To . ,gnus-maintainer) + (Subject . "") + (X-Debbugs-Package + . ,(format "%s" gnus-bug-package)) + (X-Debbugs-Version + . ,(format "%s" (gnus-continuum-version)))))) (when gnus-bug-create-help-buffer (push `(gnus-bug-kill-buffer) message-send-actions)) (goto-char (point-min)) @@ -1463,6 +1468,7 @@ (forward-line 1) (insert (format "Package: %s\n" gnus-bug-package)) (insert (format "Version: %s\n" (gnus-continuum-version))) + (insert "\n") (insert (gnus-version) "\n" (emacs-version) "\n") (when (and (boundp 'nntp-server-type) @@ -1474,7 +1480,10 @@ (erase-buffer) (gnus-debug) (setq text (buffer-string))) - (insert "<#part type=application/emacs-lisp disposition=inline description=\"User settings\">\n" text "\n<#/part>")) + (insert (concat "<#part type=application/emacs-lisp" + "disposition=inline description=\"User settings\">\n" + text + "\n<#/part>"))) (goto-char (point-min)) (search-forward "Subject: " nil t) (message ""))) === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2011-07-01 13:14:59 +0000 +++ lisp/gnus/nnir.el 2011-07-02 13:26:49 +0000 @@ -672,7 +672,8 @@ (list (cons 'query (format "HEADER Message-ID %s" article)) (cons 'unique-id article) - (cons 'criteria ""))) + (cons 'criteria "") + (cons 'shortcut t))) (unless (and (equal query nnir-current-query) (equal server nnir-current-server)) (setq nnir-artlist (nnir-run-imap query server)) @@ -791,7 +792,7 @@ (defun nnir-run-imap (query srv &optional groups) "Run a search against an IMAP back-end server. This uses a custom query language parser; see `nnir-imap-make-query' for -details on the language and supported extensions" +details on the language and supported extensions." (save-excursion (let ((qstring (cdr (assq 'query query))) (server (cadr (gnus-server-to-method srv))) @@ -804,33 +805,36 @@ (message "Opening server %s" server) (apply 'vconcat - (mapcar - (lambda (group) - (let (artlist) - (condition-case () - (when (nnimap-possibly-change-group - (gnus-group-short-name group) server) - (with-current-buffer (nnimap-buffer) - (message "Searching %s..." group) - (let ((arts 0) - (result (nnimap-command "UID SEARCH %s" - (if (string= criteria "") - qstring - (nnir-imap-make-query - criteria qstring))))) - (mapc - (lambda (artnum) - (let ((artn (string-to-number artnum))) - (when (> artn 0) - (push (vector group artn 100) - artlist) - (setq arts (1+ arts))))) - (and (car result) (cdr (assoc "SEARCH" (cdr result))))) - (message "Searching %s... %d matches" group arts))) - (message "Searching %s...done" group)) - (quit nil)) - (nreverse artlist))) - groups))))) + (catch 'found + (mapcar + (lambda (group) + (let (artlist) + (condition-case () + (when (nnimap-possibly-change-group + (gnus-group-short-name group) server) + (with-current-buffer (nnimap-buffer) + (message "Searching %s..." group) + (let ((arts 0) + (result (nnimap-command "UID SEARCH %s" + (if (string= criteria "") + qstring + (nnir-imap-make-query + criteria qstring))))) + (mapc + (lambda (artnum) + (let ((artn (string-to-number artnum))) + (when (> artn 0) + (push (vector group artn 100) + artlist) + (when (assq 'shortcut query) + (throw 'found (list artlist))) + (setq arts (1+ arts))))) + (and (car result) (cdr (assoc "SEARCH" (cdr result))))) + (message "Searching %s... %d matches" group arts))) + (message "Searching %s...done" group)) + (quit nil)) + (nreverse artlist))) + groups)))))) (defun nnir-imap-make-query (criteria qstring) "Parse the query string and criteria into an appropriate IMAP search ------------------------------------------------------------ revno: 104866 fixes bug(s): http://debbugs.gnu.org/8489 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 15:17:06 +0200 message: * frames.texi (Fonts): Mention "C-u C-x =" to find out what font you're currently using. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-07-01 17:59:15 +0000 +++ doc/emacs/ChangeLog 2011-07-02 13:17:06 +0000 @@ -1,3 +1,8 @@ +2011-07-02 Lars Magne Ingebrigtsen + + * frames.texi (Fonts): Mention "C-u C-x =" to find out what font + you're currently using (bug#8489). + 2011-07-01 Eli Zaretskii * mule.texi (Coding Systems): Move index entries from the previous === modified file 'doc/emacs/frames.texi' --- doc/emacs/frames.texi 2011-05-17 02:26:56 +0000 +++ doc/emacs/frames.texi 2011-07-02 13:17:06 +0000 @@ -689,6 +689,11 @@ X}. @end itemize +To check what font you're currently using, the @kbd{C-u C-x =} +command can be helpful. It'll describe the character under point, and +also say what font it's rendered in, if the window system you're +running under supports that. + @cindex fontconfig On X, there are four different ways to express a ``font name''. The first is to use a @dfn{Fontconfig pattern}. Fontconfig patterns have ------------------------------------------------------------ revno: 104865 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 15:08:07 +0200 message: * streams.texi (Output Functions): Document `pp'. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-06-25 18:21:00 +0000 +++ doc/lispref/ChangeLog 2011-07-02 13:08:07 +0000 @@ -1,3 +1,7 @@ +2011-07-02 Lars Magne Ingebrigtsen + + * streams.texi (Output Functions): Document `pp'. + 2011-06-25 Chong Yidong * keymaps.texi (Searching Keymaps): === modified file 'doc/lispref/streams.texi' --- doc/lispref/streams.texi 2011-01-25 04:08:28 +0000 +++ doc/lispref/streams.texi 2011-07-02 13:08:07 +0000 @@ -684,6 +684,12 @@ returns @code{"The buffer is foo"}. @end defmac +@defun pp object &optional stream +This function outputs @var{object} to @var{stream}, just like +@code{prin1}, but does it in a more ``pretty'' way. That is, it'll +indent and fill the object to make it more readable for humans. +@end defun + @node Output Variables @section Variables Affecting Output @cindex output-controlling variables ------------------------------------------------------------ revno: 104864 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2011-07-02 14:27:53 +0200 message: * disp-table.el (display-table-print-array): New function. (describe-display-table): Use it to print the vectors more pretty (Bug#8859). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-02 10:36:48 +0000 +++ lisp/ChangeLog 2011-07-02 12:27:53 +0000 @@ -1,3 +1,9 @@ +2011-07-02 Lars Magne Ingebrigtsen + + * disp-table.el (display-table-print-array): New function. + (describe-display-table): Use it to print the vectors more pretty + (Bug#8859). + 2011-07-02 Martin Rudalics * window.el (window-state-get-1): Don't assign clone numbers. === modified file 'lisp/disp-table.el' --- lisp/disp-table.el 2011-01-26 08:36:39 +0000 +++ lisp/disp-table.el 2011-07-02 12:27:53 +0000 @@ -94,9 +94,27 @@ (while (< i 256) (aset vector i (aref dt i)) (setq i (1+ i))) - (describe-vector vector)) + (describe-vector + vector 'display-table-print-array)) (help-mode)))) +(defun display-table-print-array (desc) + (insert "[") + (let ((column (current-column)) + (width (window-width)) + string) + (dotimes (i (length desc)) + (setq string (format "%s" (aref desc i))) + (cond + ((>= (+ (current-column) (length string) 1) + width) + (insert "\n") + (insert (make-string column ? ))) + ((> i 0) + (insert " "))) + (insert string))) + (insert "]\n")) + ;;;###autoload (defun describe-current-display-table () "Describe the display table in use in the selected window and buffer." ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.