Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 101554. ------------------------------------------------------------ revno: 101554 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-09-22 23:48:13 -0700 message: Remove timestamp and related local variables from table.el. It just causes unnecessary merge conflicts. diff: === modified file 'lisp/textmodes/table.el' --- lisp/textmodes/table.el 2010-09-23 06:42:45 +0000 +++ lisp/textmodes/table.el 2010-09-23 06:48:13 +0000 @@ -6,7 +6,6 @@ ;; Keywords: wp, convenience ;; Author: Takaaki Ota ;; Created: Sat Jul 08 2000 13:28:45 (PST) -;; Revised: Tue Sep 21 2010 12:42:03 (PDT) ;; This file is part of GNU Emacs. @@ -5590,14 +5589,5 @@ (provide 'table) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Local Variables: *** -;; time-stamp-line-limit: 16 *** -;; time-stamp-start: ";; Revised:[ \t]+" *** -;; time-stamp-end: "$" *** -;; time-stamp-format: "%3a %3b %02d %:y %02H:%02M:%02S (%Z)" *** -;; End: *** -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ;; arch-tag: 0d69b03e-aa5f-4e72-8806-5727217617e0 ;;; table.el ends here ------------------------------------------------------------ revno: 101553 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-09-22 23:42:45 -0700 message: Remove leading `*' from docs of some defcustoms etc. * emulation/crisp.el, emulation/cua-base.el, emulation/edt.el: * emulation/pc-select.el, emulation/vip.el, international/iso-ascii.el: * international/kkc.el, international/ogonek.el, mail/feedmail.el: * net/browse-url.el, net/eudc-vars.el, net/net-utils.el: * net/rcompile.el, net/rlogin.el, textmodes/enriched.el: * textmodes/makeinfo.el, textmodes/page-ext.el, textmodes/picture.el: * textmodes/refer.el, textmodes/spell.el, textmodes/table.el: * textmodes/tex-mode.el, textmodes/two-column.el: Remove leading `*' from docs of defcustoms etc. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-09-23 03:57:10 +0000 +++ lisp/ChangeLog 2010-09-23 06:42:45 +0000 @@ -1,3 +1,15 @@ +2010-09-23 Glenn Morris + + * emulation/crisp.el, emulation/cua-base.el, emulation/edt.el: + * emulation/pc-select.el, emulation/vip.el, international/iso-ascii.el: + * international/kkc.el, international/ogonek.el, mail/feedmail.el: + * net/browse-url.el, net/eudc-vars.el, net/net-utils.el: + * net/rcompile.el, net/rlogin.el, textmodes/enriched.el: + * textmodes/makeinfo.el, textmodes/page-ext.el, textmodes/picture.el: + * textmodes/refer.el, textmodes/spell.el, textmodes/table.el: + * textmodes/tex-mode.el, textmodes/two-column.el: + Remove leading `*' from docs of defcustoms etc. + 2010-09-23 Teodor Zlatanov * net/netrc.el (netrc-parse): Remove encrypt.el mentions. @@ -444,7 +456,7 @@ (tramp-find-inline-encoding, tramp-call-local-coding-command) (tramp-inline-compress-commands, tramp-find-inline-compress) (tramp-compute-multi-hops, tramp-maybe-open-connection) - (tramp-send-command , tramp-wait-for-output) + (tramp-send-command, tramp-wait-for-output) (tramp-send-command-and-check, tramp-barf-unless-okay) (tramp-send-command-and-read, tramp-mode-string-to-int) (tramp-convert-file-attributes, tramp-check-cached-permissions) === modified file 'lisp/emulation/crisp.el' --- lisp/emulation/crisp.el 2010-01-13 08:35:10 +0000 +++ lisp/emulation/crisp.el 2010-09-23 06:42:45 +0000 @@ -1,7 +1,7 @@ ;;; crisp.el --- CRiSP/Brief Emacs emulator -;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Gary D. Foster ;; Keywords: emulations brief crisp @@ -175,7 +175,7 @@ nice to the world.") (defcustom crisp-mode-modeline-string " *CRiSP*" - "*String to display in the modeline when CRiSP emulation mode is enabled." + "String to display in the modeline when CRiSP emulation mode is enabled." :type 'string :group 'crisp) @@ -195,7 +195,7 @@ :group 'crisp) (defcustom crisp-override-meta-x t - "*Controls overriding the normal Emacs M-x key binding in the CRiSP emulator. + "Controls overriding the normal Emacs M-x key binding in the CRiSP emulator. Normally the CRiSP emulator rebinds M-x to `save-buffers-exit-emacs', and provides the usual M-x functionality on the F10 key. If this variable is non-nil, M-x will exit Emacs." === modified file 'lisp/emulation/cua-base.el' --- lisp/emulation/cua-base.el 2010-07-10 18:52:53 +0000 +++ lisp/emulation/cua-base.el 2010-09-23 06:42:45 +0000 @@ -270,7 +270,7 @@ :link '(emacs-library-link :tag "Lisp File" "cua-base.el")) (defcustom cua-enable-cua-keys t - "*Enable using C-z, C-x, C-c, and C-v for undo, cut, copy, and paste. + "Enable using C-z, C-x, C-c, and C-v for undo, cut, copy, and paste. If the value is t, these mappings are always enabled. If the value is `shift', these keys are only enabled if the last region was marked with a shifted movement key. If the value is nil, these keys are never @@ -281,18 +281,18 @@ :group 'cua) (defcustom cua-remap-control-v t - "*If non-nil, C-v binding is used for paste (yank). + "If non-nil, C-v binding is used for paste (yank). Also, M-v is mapped to `cua-repeat-replace-region'." :type 'boolean :group 'cua) (defcustom cua-remap-control-z t - "*If non-nil, C-z binding is used for undo." + "If non-nil, C-z binding is used for undo." :type 'boolean :group 'cua) (defcustom cua-highlight-region-shift-only nil - "*If non-nil, only highlight region if marked with S-. + "If non-nil, only highlight region if marked with S-. When this is non-nil, CUA toggles `transient-mark-mode' on when the region is marked using shifted movement keys, and off when the mark is cleared. But when the mark was set using \\[cua-set-mark], Transient Mark mode @@ -302,7 +302,7 @@ (defcustom cua-prefix-override-inhibit-delay (if (featurep 'lisp-float-type) (/ (float 1) (float 5)) nil) - "*If non-nil, time in seconds to delay before overriding prefix key. + "If non-nil, time in seconds to delay before overriding prefix key. If there is additional input within this time, the prefix key is used as a normal prefix key. So typing a key sequence quickly will inhibit overriding the prefix key. @@ -315,7 +315,7 @@ :group 'cua) (defcustom cua-delete-selection t - "*If non-nil, typed text replaces text in the active selection." + "If non-nil, typed text replaces text in the active selection." :type '(choice (const :tag "Disabled" nil) (other :tag "Enabled" t)) :group 'cua) @@ -326,13 +326,13 @@ :group 'cua) (defcustom cua-toggle-set-mark t - "*If non-nil, the `cua-set-mark' command toggles the mark." + "If non-nil, the `cua-set-mark' command toggles the mark." :type '(choice (const :tag "Disabled" nil) (other :tag "Enabled" t)) :group 'cua) (defcustom cua-auto-mark-last-change nil - "*If non-nil, set implicit mark at position of last buffer change. + "If non-nil, set implicit mark at position of last buffer change. This means that \\[universal-argument] \\[cua-set-mark] will jump to the position of the last buffer change before jumping to the explicit marks on the mark ring. See `cua-set-mark' for details." @@ -340,7 +340,7 @@ :group 'cua) (defcustom cua-enable-register-prefix 'not-ctrl-u - "*If non-nil, registers are supported via numeric prefix arg. + "If non-nil, registers are supported via numeric prefix arg. If the value is t, any numeric prefix arg in the range 0 to 9 will be interpreted as a register number. If the value is `not-ctrl-u', using C-u to enter a numeric prefix is not @@ -354,29 +354,29 @@ :group 'cua) (defcustom cua-delete-copy-to-register-0 t - "*If non-nil, save last deleted region or rectangle to register 0." + "If non-nil, save last deleted region or rectangle to register 0." :type 'boolean :group 'cua) (defcustom cua-enable-region-auto-help nil - "*If non-nil, automatically show help for active region." + "If non-nil, automatically show help for active region." :type 'boolean :group 'cua) (defcustom cua-enable-modeline-indications nil - "*If non-nil, use minor-mode hook to show status in mode line." + "If non-nil, use minor-mode hook to show status in mode line." :type 'boolean :group 'cua) (defcustom cua-check-pending-input t - "*If non-nil, don't override prefix key if input pending. + "If non-nil, don't override prefix key if input pending. It is rumoured that `input-pending-p' is unreliable under some window managers, so try setting this to nil, if prefix override doesn't work." :type 'boolean :group 'cua) (defcustom cua-paste-pop-rotate-temporarily nil - "*If non-nil, \\[cua-paste-pop] only rotates the kill-ring temporarily. + "If non-nil, \\[cua-paste-pop] only rotates the kill-ring temporarily. This means that both \\[yank] and the first \\[yank-pop] in a sequence always insert the most recently killed text. Each immediately following \\[cua-paste-pop] replaces the previous text with the next older element on the `kill-ring'. @@ -388,7 +388,7 @@ ;;; Rectangle Customization (defcustom cua-virtual-rectangle-edges t - "*If non-nil, rectangles have virtual straight edges. + "If non-nil, rectangles have virtual straight edges. Note that although rectangles are always DISPLAYED with straight edges, the buffer is NOT modified, until you execute a command that actually modifies it. M-p toggles this feature when a rectangle is active." @@ -396,7 +396,7 @@ :group 'cua) (defcustom cua-auto-tabify-rectangles 1000 - "*If non-nil, automatically tabify after rectangle commands. + "If non-nil, automatically tabify after rectangle commands. This basically means that `tabify' is applied to all lines that are modified by inserting or deleting a rectangle. If value is an integer, CUA will look for existing tabs in a region around @@ -428,7 +428,7 @@ :group 'cua) (defcustom cua-rectangle-modifier-key 'meta - "*Modifier key used for rectangle commands bindings. + "Modifier key used for rectangle commands bindings. On non-window systems, always use the meta modifier. Must be set prior to enabling CUA." :type '(choice (const :tag "Meta key" meta) @@ -438,27 +438,27 @@ :group 'cua) (defcustom cua-enable-rectangle-auto-help t - "*If non-nil, automatically show help for region, rectangle and global mark." + "If non-nil, automatically show help for region, rectangle and global mark." :type 'boolean :group 'cua) (defface cua-rectangle '((default :inherit region) (((class color)) :foreground "white" :background "maroon")) - "*Font used by CUA for highlighting the rectangle." + "Font used by CUA for highlighting the rectangle." :group 'cua) (defface cua-rectangle-noselect '((default :inherit region) (((class color)) :foreground "white" :background "dimgray")) - "*Font used by CUA for highlighting the non-selected rectangle lines." + "Font used by CUA for highlighting the non-selected rectangle lines." :group 'cua) ;;; Global Mark Customization (defcustom cua-global-mark-keep-visible t - "*If non-nil, always keep global mark visible in other window." + "If non-nil, always keep global mark visible in other window." :type 'boolean :group 'cua) @@ -466,11 +466,11 @@ '((((min-colors 88)(class color)) :foreground "black" :background "yellow1") (((class color)) :foreground "black" :background "yellow") (t :bold t)) - "*Font used by CUA for highlighting the global mark." + "Font used by CUA for highlighting the global mark." :group 'cua) (defcustom cua-global-mark-blink-cursor-interval 0.20 - "*Blink cursor at this interval when global mark is active." + "Blink cursor at this interval when global mark is active." :type '(choice (number :tag "Blink interval") (const :tag "No blink" nil)) :group 'cua) @@ -479,7 +479,7 @@ ;;; Cursor Indication Customization (defcustom cua-enable-cursor-indications nil - "*If non-nil, use different cursor colors for indications." + "If non-nil, use different cursor colors for indications." :type 'boolean :group 'cua) @@ -517,7 +517,7 @@ :group 'cua) (defcustom cua-read-only-cursor-color "darkgreen" - "*Cursor color used in read-only buffers, if non-nil. + "Cursor color used in read-only buffers, if non-nil. Only used when `cua-enable-cursor-indications' is non-nil. If the value is a COLOR name, then only the `cursor-color' attribute will be @@ -541,7 +541,7 @@ :group 'cua) (defcustom cua-overwrite-cursor-color "yellow" - "*Cursor color used when overwrite mode is set, if non-nil. + "Cursor color used when overwrite mode is set, if non-nil. Only used when `cua-enable-cursor-indications' is non-nil. If the value is a COLOR name, then only the `cursor-color' attribute will be @@ -565,7 +565,7 @@ :group 'cua) (defcustom cua-global-mark-cursor-color "cyan" - "*Indication for active global mark. + "Indication for active global mark. Will change cursor color to specified color if string. Only used when `cua-enable-cursor-indications' is non-nil. === modified file 'lisp/emulation/edt.el' --- lisp/emulation/edt.el 2010-05-26 14:19:15 +0000 +++ lisp/emulation/edt.el 2010-09-23 06:42:45 +0000 @@ -194,7 +194,7 @@ ;;; (defcustom edt-keep-current-page-delimiter nil - "*Emacs MUST be restarted for a change in value to take effect! + "Emacs MUST be restarted for a change in value to take effect! Non-nil leaves Emacs value of `page-delimiter' unchanged within EDT Emulation. If set to nil (the default), the `page-delimiter' variable is set to \"\\f\" when edt-emulation-on is first invoked. This @@ -204,7 +204,7 @@ :group 'edt) (defcustom edt-use-EDT-control-key-bindings nil - "*Emacs MUST be restarted for a change in value to take effect! + "Emacs MUST be restarted for a change in value to take effect! Non-nil causes the control key bindings to be replaced with EDT bindings. If set to nil (the default), EDT control key bindings are not used and the current Emacs control key bindings are retained for @@ -213,7 +213,7 @@ :group 'edt) (defcustom edt-word-entities '(?\t) - "*Specifies the list of EDT word entity characters. + "Specifies the list of EDT word entity characters. The default list, (\?\\t), contains just the TAB character, which emulates EDT. Characters are specified in the list using their decimal ASCII values. A question mark, followed by the actual @@ -238,14 +238,14 @@ :group 'edt) (defcustom edt-top-scroll-margin 10 - "*Scroll margin at the top of the screen. + "Scroll margin at the top of the screen. Interpreted as a percent of the current window size with a default setting of 10%. If set to 0, top scroll margin is disabled." :type 'integer :group 'edt) (defcustom edt-bottom-scroll-margin 15 - "*Scroll margin at the bottom of the screen. + "Scroll margin at the bottom of the screen. Interpreted as a percent of the current window size with a default setting of 15%. If set to 0, bottom scroll margin is disabled." :type 'integer === modified file 'lisp/emulation/pc-select.el' --- lisp/emulation/pc-select.el 2010-08-08 21:12:29 +0000 +++ lisp/emulation/pc-select.el 2010-09-23 06:42:45 +0000 @@ -85,7 +85,7 @@ :group 'emulations) (defcustom pc-select-override-scroll-error t - "*Non-nil means don't generate error on scrolling past edge of buffer. + "Non-nil means don't generate error on scrolling past edge of buffer. This variable applies in PC Selection mode only. The scroll commands normally generate an error if you try to scroll past the top or bottom of the buffer. This is annoying when selecting @@ -98,14 +98,14 @@ "24.1") (defcustom pc-select-selection-keys-only nil - "*Non-nil means only bind the basic selection keys when started. + "Non-nil means only bind the basic selection keys when started. Other keys that emulate pc-behavior will be untouched. This gives mostly Emacs-like behavior with only the selection keys enabled." :type 'boolean :group 'pc-select) (defcustom pc-select-meta-moves-sexps nil - "*Non-nil means move sexp-wise with Meta key, otherwise move word-wise." + "Non-nil means move sexp-wise with Meta key, otherwise move word-wise." :type 'boolean :group 'pc-select) === modified file 'lisp/emulation/vip.el' --- lisp/emulation/vip.el 2010-01-13 08:35:10 +0000 +++ lisp/emulation/vip.el 2010-09-23 06:42:45 +0000 @@ -91,12 +91,12 @@ "How to reexecute last destructive command. Value is list (M-COM VAL COM).") (defcustom vip-shift-width 8 - "*The number of columns shifted by > and < command." + "The number of columns shifted by > and < command." :type 'integer :group 'vip) (defcustom vip-re-replace nil - "*If t then do regexp replace, if nil then do string replace." + "If t then do regexp replace, if nil then do string replace." :type 'boolean :group 'vip) @@ -116,12 +116,12 @@ "For use by \";\" command.") (defcustom vip-search-wrap-around t - "*If t, search wraps around." + "If t, search wraps around." :type 'boolean :group 'vip) (defcustom vip-re-search nil - "*If t, search is reg-exp search, otherwise vanilla search." + "If t, search is reg-exp search, otherwise vanilla search." :type 'boolean :group 'vip) @@ -132,22 +132,22 @@ "If t, search is forward.") (defcustom vip-case-fold-search nil - "*If t, search ignores cases." + "If t, search ignores cases." :type 'boolean :group 'vip) (defcustom vip-re-query-replace nil - "*If t then do regexp replace, if nil then do string replace." + "If t then do regexp replace, if nil then do string replace." :type 'boolean :group 'vip) (defcustom vip-open-with-indent nil - "*If t, indent when open a new line." + "If t, indent when open a new line." :type 'boolean :group 'vip) (defcustom vip-help-in-insert-mode nil - "*If t then C-h is bound to help-command in insert mode. + "If t then C-h is bound to help-command in insert mode. If nil then it is bound to `delete-backward-char'." :type 'boolean :group 'vip) === modified file 'lisp/international/iso-ascii.el' --- lisp/international/iso-ascii.el 2010-05-05 02:08:25 +0000 +++ lisp/international/iso-ascii.el 2010-09-23 06:42:45 +0000 @@ -1,7 +1,7 @@ ;;; iso-ascii.el --- set up char tables for ISO 8859/1 on ASCII terminals -;; Copyright (C) 1987, 1995, 1998, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1987, 1995, 1998, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: FSF @@ -41,7 +41,7 @@ :group 'i18n) (defcustom iso-ascii-convenient nil - "*Non-nil means `iso-ascii' should aim for convenience, not precision." + "Non-nil means `iso-ascii' should aim for convenience, not precision." :type 'boolean :group 'iso-ascii) === modified file 'lisp/international/kkc.el' --- lisp/international/kkc.el 2010-01-13 08:35:10 +0000 +++ lisp/international/kkc.el 2010-09-23 06:42:45 +0000 @@ -1,7 +1,7 @@ ;;; kkc.el --- Kana Kanji converter -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, -;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010 ;; National Institute of Advanced Industrial Science and Technology (AIST) @@ -135,7 +135,7 @@ (defvar kkc-current-conversions-width nil) (defcustom kkc-show-conversion-list-count 4 - "*Count of successive `kkc-next' or `kkc-prev' to show conversion list. + "Count of successive `kkc-next' or `kkc-prev' to show conversion list. When you type SPC or C-p successively this count while using the input method `japanese', the conversion candidates are shown in the echo area while indicating the current selection by `'." === modified file 'lisp/international/ogonek.el' --- lisp/international/ogonek.el 2010-01-13 08:35:10 +0000 +++ lisp/international/ogonek.el 2010-09-23 06:42:45 +0000 @@ -273,23 +273,23 @@ ogonek-name-encoding-alist)) "List of ogonek encodings. Used only for customization.") (defcustom ogonek-from-encoding "iso8859-2" - "*Encoding in the source file of recoding." + "Encoding in the source file of recoding." :type ogonek-encoding-choices :group 'ogonek) (defcustom ogonek-to-encoding "ascii" - "*Encoding in the target file of recoding." + "Encoding in the target file of recoding." :type ogonek-encoding-choices :group 'ogonek) (defcustom ogonek-prefix-char ?/ - "*Prefix character for prefix encodings." + "Prefix character for prefix encodings." :type 'character :group 'ogonek) (defcustom ogonek-prefix-from-encoding "iso8859-2" - "*Encoding in the source file subject to prefixifation." + "Encoding in the source file subject to prefixifation." :type ogonek-encoding-choices :group 'ogonek) (defcustom ogonek-prefix-to-encoding "iso8859-2" - "*Encoding in the target file subject to deprefixifation." + "Encoding in the target file subject to deprefixifation." :type ogonek-encoding-choices :group 'ogonek) === modified file 'lisp/mail/feedmail.el' --- lisp/mail/feedmail.el 2010-01-04 05:35:18 +0000 +++ lisp/mail/feedmail.el 2010-09-23 06:42:45 +0000 @@ -314,7 +314,7 @@ (defcustom feedmail-confirm-outgoing nil - "*If non-nil, give a y-or-n confirmation prompt before sending mail. + "If non-nil, give a y-or-n confirmation prompt before sending mail. This is done after the message is completely prepped, and you'll be looking at the top of the message in a buffer when you get the prompt. If set to the symbol 'queued, give the confirmation prompt only while @@ -330,7 +330,7 @@ (defcustom feedmail-confirm-outgoing-timeout nil - "*If non-nil, a timeout in seconds at the send confirmation prompt. + "If non-nil, a timeout in seconds at the send confirmation prompt. If a positive number, it's a timeout before sending. If a negative number, it's a timeout before not sending. This will not work if your version of Emacs doesn't include the function `y-or-n-p-with-timeout' @@ -341,7 +341,7 @@ (defcustom feedmail-nuke-bcc t - "*If non-nil remove Bcc: lines from the message headers. + "If non-nil remove Bcc: lines from the message headers. In any case, the Bcc: lines do participate in the composed address list. You may want to leave them in if you're using sendmail \(see `feedmail-buffer-eating-function'\)." @@ -351,7 +351,7 @@ (defcustom feedmail-nuke-resent-bcc t - "*If non-nil remove Resent-Bcc: lines from the message headers. + "If non-nil remove Resent-Bcc: lines from the message headers. In any case, the Resent-Bcc: lines do participate in the composed address list. You may want to leave them in if you're using sendmail \(see `feedmail-buffer-eating-function'\)." @@ -361,7 +361,7 @@ (defcustom feedmail-deduce-bcc-where nil - "*Where Bcc:/Resent-Bcc: addresses should appear in the envelope list. + "Where Bcc:/Resent-Bcc: addresses should appear in the envelope list. Addresses for the message envelope are deduced by examining appropriate address headers in the message. Generally, they will show up in the list of deduced addresses in the order that the headers @@ -387,7 +387,7 @@ (defcustom feedmail-fill-to-cc t - "*If non-nil do smart filling of addressee header lines. + "If non-nil do smart filling of addressee header lines. Smart filling means breaking long lines at appropriate points and making continuation lines. Despite the function name, it includes To:, Cc:, Bcc: (and their Resent-* forms), as well as From: and @@ -399,14 +399,14 @@ (defcustom feedmail-fill-to-cc-fill-column default-fill-column - "*Fill column used by `feedmail-fill-to-cc'." + "Fill column used by `feedmail-fill-to-cc'." :group 'feedmail-headers :type 'integer ) (defcustom feedmail-nuke-bcc-in-fcc nil - "*If non-nil remove [Resent-]Bcc: lines in message copies saved via Fcc:. + "If non-nil remove [Resent-]Bcc: lines in message copies saved via Fcc:. This is independent of whether the Bcc: header lines are actually sent with the message (see feedmail-nuke-bcc). Though not implied in the name, the same Fcc: treatment applies to both Bcc: and Resent-Bcc: lines." @@ -416,7 +416,7 @@ (defcustom feedmail-nuke-body-in-fcc nil - "*If non-nil remove body of message in copies saved via Fcc:. + "If non-nil remove body of message in copies saved via Fcc:. If a positive integer value, leave (up to) that many lines of the beginning of the body intact. The result is that the Fcc: copy will consist only of the message headers, serving as a sort of an outgoing @@ -427,7 +427,7 @@ (defcustom feedmail-force-expand-mail-aliases nil - "*If non-nil, force the calling of `expand-mail-aliases'. + "If non-nil, force the calling of `expand-mail-aliases'. Normally, feedmail tries to figure out if you're using mailalias or mailabbrevs and only calls `expand-mail-aliases' if it thinks you're using the mailalias package. This user option can be used to force @@ -439,7 +439,7 @@ (defcustom feedmail-nuke-empty-headers t - "*If non-nil, remove header lines which have no contents. + "If non-nil, remove header lines which have no contents. A completely empty Subject: header is always removed, regardless of the setting of this variable. The only time you would want them left in would be if you used some headers whose presence indicated @@ -457,7 +457,7 @@ ;; RFC-822 and RFC-1123, but are you *really* one of those cases ;; they're talking about? I doubt it.) (defcustom feedmail-sender-line nil - "*If non-nil and the email has no Sender: header, use this value. + "If non-nil and the email has no Sender: header, use this value. May be nil, in which case nothing in particular is done with respect to Sender: lines. By design, will not replace an existing Sender: line, but you can achieve that with a fiddle-plex 'replace action. @@ -484,7 +484,7 @@ (defcustom feedmail-force-binary-write t - "*If non-nil, force writing file as binary (this applies to queues and Fcc:). + "If non-nil, force writing file as binary (this applies to queues and Fcc:). On systems where there is a difference between binary and text files, feedmail will temporarily manipulate the value of `buffer-file-type' to make the writing as binary. If nil, writing will be in text mode. @@ -496,7 +496,7 @@ (defcustom feedmail-from-line t - "*If non-nil and the email has no From: header, use this value. + "If non-nil and the email has no From: header, use this value. May be t, in which case a default is computed (and you probably won't be happy with it). May be nil, in which case nothing in particular is done with respect to From: lines. By design, will not replace an @@ -526,7 +526,7 @@ (defcustom feedmail-deduce-envelope-from t - "*If non-nil, deduce message envelope \"from\" from header From: or Sender:. + "If non-nil, deduce message envelope \"from\" from header From: or Sender:. In other words, if there is a Sender: header in the message, temporarily change the value of `user-mail-address' to be the same while the message is being sent. If there is no Sender: header, use the From: header, @@ -555,14 +555,14 @@ (defcustom feedmail-x-mailer-line-user-appendage nil - "*See feedmail-x-mailer-line." + "See feedmail-x-mailer-line." :group 'feedmail-headers :type '(choice (const nil) (const t) string) ) (defcustom feedmail-x-mailer-line t - "*Control the form of an X-Mailer: header in an outgoing message. + "Control the form of an X-Mailer: header in an outgoing message. Moderately useful for debugging, keeping track of your correspondents' mailer preferences, or just wearing your MUA on your sleeve. You should probably know that some people are fairly emotional about the @@ -592,7 +592,7 @@ (defcustom feedmail-message-id-generator t - "*Specifies the creation of a Message-Id: header field. + "Specifies the creation of a Message-Id: header field. If nil, nothing is done about Message-Id:. @@ -622,7 +622,7 @@ (defcustom feedmail-message-id-suffix nil - "*If non-nil, used as a suffix for generating unique Message-Id: headers. + "If non-nil, used as a suffix for generating unique Message-Id: headers. The function `feedmail-default-message-id-generator' creates its work based on a formatted date-time string, a random number, and a domain-looking suffix. You can control the suffix used by assigning a string value to this variable. @@ -637,7 +637,7 @@ ;; this was suggested in various forms by several people; first was ;; Tony DeSimone in Oct 1992; sorry to be so tardy (defcustom feedmail-date-generator t - "*Specifies the creation of a Date: header field. + "Specifies the creation of a Date: header field. If nil, nothing is done about Date:. @@ -671,7 +671,7 @@ (defcustom feedmail-fiddle-headers-upwardly t - "*Non-nil means fiddled header fields should go at the top of the header. + "Non-nil means fiddled header fields should go at the top of the header. nil means insert them at the bottom. This is mostly a novelty issue since the standards define the ordering of header fields to be immaterial and it's fairly likely that some MTA along the way will have its own idea of what the @@ -777,7 +777,7 @@ (defcustom feedmail-enable-queue nil - "*If non-nil, provide for stashing outgoing messages in a queue. + "If non-nil, provide for stashing outgoing messages in a queue. This is the master on/off switch for feedmail message queuing. Queuing is quite handy for laptop-based users. It's also handy if you get a lot of mail and process it more or less sequentially. For @@ -804,7 +804,7 @@ (defcustom feedmail-queue-runner-confirm-global nil - "*If non-nil, give a y-or-n confirmation prompt before running the queue. + "If non-nil, give a y-or-n confirmation prompt before running the queue. Prompt even if the queue is about to be processed as a result of a call to `feedmail-run-the-queue-no-prompts'. This gives you a way to bail out without having to answer no to the individual message prompts." @@ -814,7 +814,7 @@ (defcustom feedmail-queue-directory (concat (getenv "HOME") "/mail/q") - "*Name of a directory where messages will be queued. + "Name of a directory where messages will be queued. Directory will be created if necessary. Should be a string that doesn't end with a slash. Default is \"$HOME/mail/q\"." :group 'feedmail-queue @@ -824,7 +824,7 @@ (defcustom feedmail-queue-draft-directory (concat (getenv "HOME") "/mail/draft") - "*Name of a directory where draft messages will be queued. + "Name of a directory where draft messages will be queued. Directory will be created if necessary. Should be a string that doesn't end with a slash. Default is \"$HOME/mail/draft\"." :group 'feedmail-queue @@ -833,7 +833,7 @@ (defcustom feedmail-ask-before-queue t - "*If non-nil, feedmail will ask what you want to do with the message. + "If non-nil, feedmail will ask what you want to do with the message. Default choices for the message action prompt will include sending it immediately, putting it in the main queue, putting it in the draft queue, or returning to the buffer to continue editing. Only matters if @@ -845,7 +845,7 @@ (defcustom feedmail-ask-before-queue-prompt "FQM: Message action (q, i, d, e, ?)? [%s]: " - "*A string which will be used for the message action prompt. + "A string which will be used for the message action prompt. If it contains a \"%s\", that will be replaced with the value of `feedmail-ask-before-queue-default'." :group 'feedmail-queue @@ -854,7 +854,7 @@ (defcustom feedmail-ask-before-queue-reprompt "FQM: Please type q, i, d, or e; or ? for help [%s]: " - "*A string which will be used for repompting after invalid input. + "A string which will be used for repompting after invalid input. If it contains a \"%s\", that will be replaced with the value of `feedmail-ask-before-queue-default'." :group 'feedmail-queue @@ -863,7 +863,7 @@ (defcustom feedmail-ask-before-queue-default "queue" - "*Meaning if user hits return in response to the message action prompt. + "Meaning if user hits return in response to the message action prompt. Should be a character or a string; if a string, only the first character is significant. Useful values are those described in the help for the message action prompt." @@ -947,7 +947,7 @@ (defcustom feedmail-queue-chatty t - "*If non-nil, blat a few status messages and such in the mini-buffer. + "If non-nil, blat a few status messages and such in the mini-buffer. If nil, just do the work and don't pester people about what's going on. In some cases, though, specific options inspire mini-buffer prompting. That's not affected by this variable setting. Also does not control @@ -958,7 +958,7 @@ (defcustom feedmail-queue-chatty-sit-for 2 - "*Duration of pause after most queue-related messages. + "Duration of pause after most queue-related messages. After some messages are divulged, it is prudent to pause before something else obliterates them. This value controls the duration of the pause." @@ -968,7 +968,7 @@ (defcustom feedmail-queue-run-orderer nil - "*If non-nil, name a function which will sort the queued messages. + "If non-nil, name a function which will sort the queued messages. The function is called during a running of the queue for sending, and takes one argument, a list of the files in the queue directory. It may contain the names of non-message files, and it's okay to leave @@ -982,7 +982,7 @@ (defcustom feedmail-queue-use-send-time-for-date nil - "*If non-nil, use send time for the Date: header value. + "If non-nil, use send time for the Date: header value. This variable is used by the default date generating function, feedmail-default-date-generator. If nil, the default, the last-modified timestamp of the queue file is used to create the @@ -994,7 +994,7 @@ (defcustom feedmail-queue-use-send-time-for-message-id nil - "*If non-nil, use send time for the Message-Id: header value. + "If non-nil, use send time for the Message-Id: header value. This variable is used by the default Message-Id: generating function, `feedmail-default-message-id-generator'. If nil, the default, the last-modified timestamp of the queue file is used to create the @@ -1006,7 +1006,7 @@ (defcustom feedmail-ask-for-queue-slug nil - "*If non-nil, prompt user for part of the queue file name. + "If non-nil, prompt user for part of the queue file name. The file will automatically get the FQM suffix and an embedded sequence number for uniqueness, so don't specify that. feedmail will get rid of all characters other than alphanumeric and hyphen in the @@ -1023,7 +1023,7 @@ (defcustom feedmail-queue-slug-maker 'feedmail-queue-subject-slug-maker - "*If non-nil, a function which creates part of the queued file name. + "If non-nil, a function which creates part of the queued file name. Takes a single argument giving the name of the directory into which the message will be queued. The returned string should be just the non-directory filename part, without FQM suffix or uniquifying @@ -1036,7 +1036,7 @@ (defcustom feedmail-queue-default-file-slug t - "*Indicates what to use for subject-less messages when forming a file name. + "Indicates what to use for subject-less messages when forming a file name. When feedmail queues a message, it creates a unique file name. By default, the file name is based in part on the subject of the message being queued. If there is no subject, consult this variable. See documentation for the @@ -1059,7 +1059,7 @@ (defcustom feedmail-queue-fqm-suffix ".fqm" - "*The FQM suffix used to distinguish feedmail queued message files. + "The FQM suffix used to distinguish feedmail queued message files. You probably want this to be a period followed by some letters and/or digits. The distinction is to be able to tell them from other random files that happen to be in the `feedmail-queue-directory' or @@ -1071,7 +1071,7 @@ (defcustom feedmail-nuke-buffer-after-queue nil - "*If non-nil, silently kill the buffer after a message is queued. + "If non-nil, silently kill the buffer after a message is queued. You might like that since a side-effect of queueing the message is that its buffer name gets changed to the filename. That means that the buffer won't be reused for the next message you compose. If you @@ -1084,7 +1084,7 @@ (defcustom feedmail-queue-auto-file-nuke nil - "*If non-nil, automatically delete queue files when a message is sent. + "If non-nil, automatically delete queue files when a message is sent. Normally, feedmail will notice such files when you send a message in immediate mode (i.e., not when you're running the queue) and will ask if you want to delete them. Since the answer is usually yes, setting this @@ -1154,7 +1154,7 @@ (defcustom feedmail-last-chance-hook nil - "*User's last opportunity to modify the message on its way out. + "User's last opportunity to modify the message on its way out. It has already had all the header prepping from the standard package. The next step after running the hook will be to push the buffer into a subprocess that mails the mail. The hook might be interested in @@ -1172,7 +1172,7 @@ (defcustom feedmail-before-fcc-hook nil - "*User's last opportunity to modify the message before Fcc action. + "User's last opportunity to modify the message before Fcc action. It has already had all the header prepping from the standard package. The next step after running the hook will be to save the message via Fcc: processing. The hook might be interested in these: (1) @@ -1189,7 +1189,7 @@ (defcustom feedmail-queue-runner-mode-setter '(lambda (&optional arg) (mail-mode)) - "*A function to set the proper mode of a message file. + "A function to set the proper mode of a message file. Called when the message is read back out of the queue directory with a single argument, the optional argument used in the call to `feedmail-run-the-queue' or `feedmail-run-the-queue-no-prompts'. @@ -1204,7 +1204,7 @@ (defcustom feedmail-queue-alternative-mail-header-separator nil - "*Alternative header demarcation for queued messages. + "Alternative header demarcation for queued messages. If you sometimes get alternative values for `mail-header-separator' in queued messages, set the value of this variable to whatever it is. For example, `rmail-resend' uses a `mail-header-separator' value of empty @@ -1221,7 +1221,7 @@ (defcustom feedmail-queue-runner-message-sender 'mail-send-and-exit - "*Function to initiate sending a message file. + "Function to initiate sending a message file. Called for each message read back out of the queue directory with a single argument, the optional argument used in the call to `feedmail-run-the-queue' or `feedmail-run-the-queue-no-prompts'. @@ -1238,7 +1238,7 @@ '(lambda (fqm-file &optional arg) (delete-file fqm-file) (if (and arg feedmail-queue-chatty) (message "FQM: Nuked %s" fqm-file))) - "*Function that will be called after a message has been sent. + "Function that will be called after a message has been sent. Not called in the case of errors. This function is called with two arguments: the name of the message queue file for the message just sent, and the optional argument used in the call to `feedmail-run-the-queue' @@ -1265,7 +1265,7 @@ (defcustom feedmail-buffer-eating-function 'feedmail-buffer-to-binmail - "*Function used to send the prepped buffer to a subprocess. + "Function used to send the prepped buffer to a subprocess. The function's three (mandatory) arguments are: (1) the buffer containing the prepped message; (2) a buffer where errors should be directed; and (3) a list containing the addresses individually as @@ -1281,7 +1281,7 @@ (defcustom feedmail-binmail-template (if mail-interactive "/bin/mail %s" "/bin/rmail %s") - "*Command template for the subprocess which will get rid of the mail. + "Command template for the subprocess which will get rid of the mail. It can result in any command understandable by /bin/sh. Might not work at all in non-Unix environments. The single '%s', if present, gets replaced by the space-separated, simplified list of addressees. @@ -1446,7 +1446,7 @@ ;; From a VM mailing list discussion and some suggestions from Samuel Mikes (defun feedmail-queue-express-to-queue () - "*Send message directly to the queue, with a minimum of fuss and bother." + "Send message directly to the queue, with a minimum of fuss and bother." (interactive) (let ((feedmail-enable-queue t) (feedmail-ask-before-queue nil) @@ -1458,7 +1458,7 @@ (defun feedmail-queue-express-to-draft () - "*Send message directly to the draft queue, with a minimum of fuss and bother." + "Send message directly to the draft queue, with a minimum of fuss and bother." (interactive) (let ((feedmail-queue-directory feedmail-queue-draft-directory)) (feedmail-queue-express-to-queue) === modified file 'lisp/net/browse-url.el' --- lisp/net/browse-url.el 2010-08-17 08:01:10 +0000 +++ lisp/net/browse-url.el 2010-09-23 06:42:45 +0000 @@ -1,7 +1,8 @@ ;;; browse-url.el --- pass a URL to a WWW browser -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Denis Howe ;; Maintainer: FSF @@ -607,7 +608,7 @@ :group 'browse-url) (defcustom browse-url-elinks-wrapper '("xterm" "-e") - "*Wrapper command prepended to the Elinks command-line." + "Wrapper command prepended to the Elinks command-line." :type '(repeat (string :tag "Wrapper")) :group 'browse-url) === modified file 'lisp/net/eudc-vars.el' --- lisp/net/eudc-vars.el 2010-08-29 16:17:13 +0000 +++ lisp/net/eudc-vars.el 2010-09-23 06:42:45 +0000 @@ -1,7 +1,7 @@ ;;; eudc-vars.el --- Emacs Unified Directory Client -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo ;; Maintainer: Pavel Janík @@ -39,7 +39,7 @@ :group 'comm) (defcustom eudc-server nil - "*The name or IP address of the directory server. + "The name or IP address of the directory server. A port number may be specified by appending a colon and a number to the name of the server. Use `localhost' if the directory server resides on your computer (BBDB backend)." @@ -56,7 +56,7 @@ are loaded, *do not change manually*.") (defcustom eudc-protocol nil - "*The directory protocol to use to query the server. + "The directory protocol to use to query the server. Supported protocols are specified by `eudc-supported-protocols'." :type `(choice :menu-tag "Protocol" ,@(mapcar (lambda (s) @@ -67,13 +67,13 @@ (defcustom eudc-strict-return-matches t - "*Ignore or allow entries not containing all requested return attributes. + "Ignore or allow entries not containing all requested return attributes. If non-nil, such entries are ignored." :type 'boolean :group 'eudc) (defcustom eudc-default-return-attributes nil - "*A list of default attributes to extract from directory entries. + "A list of default attributes to extract from directory entries. If set to the symbol `all', return all attributes. A value of nil means return the default attributes as configured in the server." @@ -87,7 +87,7 @@ :group 'eudc) (defcustom eudc-multiple-match-handling-method 'select - "*What to do when multiple entries match an inline expansion query. + "What to do when multiple entries match an inline expansion query. Possible values are: `first' (equivalent to nil) which means keep the first match only, `select' pop-up a selection buffer, @@ -107,7 +107,7 @@ :group 'eudc) (defcustom eudc-duplicate-attribute-handling-method '((email . duplicate)) - "*A method to handle entries containing duplicate attributes. + "A method to handle entries containing duplicate attributes. This is either an alist (ATTR . METHOD) or a symbol METHOD. The alist form of the variable associates a method to an individual attribute, the second form specifies a method applicable to all attributes. @@ -136,7 +136,7 @@ (defcustom eudc-inline-query-format '((name) (firstname name)) - "*Format of an inline expansion query. + "Format of an inline expansion query. This is a list of FORMATs. A FORMAT is itself a list of one or more EUDC attribute names. A FORMAT applies if it contains as many attributes as there are individual words in the inline query string. @@ -164,12 +164,12 @@ :group 'eudc) (defcustom eudc-expansion-overwrites-query t - "*If non-nil, expanding a query overwrites the query string." + "If non-nil, expanding a query overwrites the query string." :type 'boolean :group 'eudc) (defcustom eudc-inline-expansion-format '("%s" email) - "*A list specifying the format of the expansion of inline queries. + "A list specifying the format of the expansion of inline queries. This variable controls what `eudc-expand-inline' actually inserts in the buffer. First element is a string passed to `format'. Remaining elements are symbols indicating attribute names; the corresponding values @@ -189,7 +189,7 @@ :group 'eudc) (defcustom eudc-inline-expansion-servers 'server-then-hotlist - "*Which servers to contact for the expansion of inline queries. + "Which servers to contact for the expansion of inline queries. Possible values are: `current-server': the EUDC current server. `hotlist': the servers of the hotlist in the order they appear, @@ -203,7 +203,7 @@ :group 'eudc) (defcustom eudc-max-servers-to-query nil - "*Maximum number of servers to query for an inline expansion. + "Maximum number of servers to query for an inline expansion. If nil, query all servers available from `eudc-inline-expansion-servers'." :tag "Max Number of Servers to Query" :type '(choice :tag "Max. Servers" @@ -218,7 +218,7 @@ :group 'eudc) (defcustom eudc-query-form-attributes '(name firstname email phone) - "*A list of attributes presented in the query form." + "A list of attributes presented in the query form." :tag "Attributes in Query Forms" :type '(repeat (choice @@ -249,7 +249,7 @@ (telephonenumber . "Phone") (uniqueidentifier . "ID") (objectclass . "Object Class")) - "*Alist of user-defined names for directory attributes. + "Alist of user-defined names for directory attributes. These names are used as prompt strings in query/response forms instead of the raw directory attribute names. Prompt strings for attributes that are not listed here @@ -262,14 +262,14 @@ :group 'eudc) (defcustom eudc-use-raw-directory-names nil - "*If non-nil, use attributes names as defined in the directory. + "If non-nil, use attributes names as defined in the directory. Otherwise, directory query/response forms display the user attribute names defined in `eudc-user-attribute-names-alist'." :type 'boolean :group 'eudc) (defcustom eudc-attribute-display-method-alist nil - "*An alist specifying methods to display attribute values. + "An alist specifying methods to display attribute values. Each member of the list is of the form (NAME . FUNC) where NAME is a lowercased string naming a directory attribute (translated according to `eudc-user-attribute-names-alist' if `eudc-use-raw-directory-names' is @@ -283,7 +283,7 @@ (defcustom eudc-external-viewers '(("ImageMagick" "display" "-") ("ShowAudio" "showaudio")) - "*A list of viewer program specifications. + "A list of viewer program specifications. Viewers are programs which can be piped a directory attribute value for display or arbitrary processing. Each specification is a list whose first element is a string naming the viewer. The second element is the @@ -300,12 +300,12 @@ :group 'eudc) (defcustom eudc-options-file "~/.eudc-options" - "*A file where the `servers' hotlist is stored." + "A file where the `servers' hotlist is stored." :type '(file :Tag "File Name:") :group 'eudc) (defcustom eudc-mode-hook nil - "*Normal hook run on entry to EUDC mode." + "Normal hook run on entry to EUDC mode." :type '(repeat (sexp :tag "Hook definition")) :group 'eudc) @@ -323,7 +323,7 @@ (address . (eudc-bbdbify-address address "Address")) (phone . ((eudc-bbdbify-phone phone "Phone") (eudc-bbdbify-phone office_phone "Office Phone")))) - "*A mapping from BBDB to PH/QI fields. + "A mapping from BBDB to PH/QI fields. This is a list of cons cells (BBDB-FIELD . SPEC-OR-LIST) where BBDB-FIELD is the name of a field that must be defined in your BBDB environment (standard field names are `name', `company', `net', `phone', @@ -358,7 +358,7 @@ (net . mail) (address . (eudc-bbdbify-address postaladdress "Address")) (phone . ((eudc-bbdbify-phone telephonenumber "Phone")))) - "*A mapping from BBDB to LDAP attributes. + "A mapping from BBDB to LDAP attributes. This is a list of cons cells (BBDB-FIELD . SPEC-OR-LIST) where BBDB-FIELD is the name of a field that must be defined in your BBDB environment (standard field names are `name', `company', `net', `phone', === modified file 'lisp/net/ldap.el' --- lisp/net/ldap.el 2010-01-13 08:35:10 +0000 +++ lisp/net/ldap.el 2010-09-23 06:42:45 +0000 @@ -1,7 +1,7 @@ ;;; ldap.el --- client interface to LDAP for Emacs -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo ;; Maintainer: FSF @@ -43,7 +43,7 @@ :group 'comm) (defcustom ldap-default-host nil - "*Default LDAP server. + "Default LDAP server. A TCP port number can be appended to that name using a colon as a separator." :type '(choice (string :tag "Host name") @@ -51,14 +51,14 @@ :group 'ldap) (defcustom ldap-default-port nil - "*Default TCP port for LDAP connections. + "Default TCP port for LDAP connections. Initialized from the LDAP library at build time. Default value is 389." :type '(choice (const :tag "Use library default" nil) (integer :tag "Port number")) :group 'ldap) (defcustom ldap-default-base nil - "*Default base for LDAP searches. + "Default base for LDAP searches. This is a string using the syntax of RFC 1779. For instance, \"o=ACME, c=US\" limits the search to the Acme organization in the United States." @@ -68,7 +68,7 @@ (defcustom ldap-host-parameters-alist nil - "*Alist of host-specific options for LDAP transactions. + "Alist of host-specific options for LDAP transactions. The format of each list element is (HOST PROP1 VAL1 PROP2 VAL2 ...). HOST is the hostname of an LDAP server (with an optional TCP port number appended to it using a colon as a separator). @@ -148,28 +148,28 @@ :group 'ldap) (defcustom ldap-ldapsearch-prog "ldapsearch" - "*The name of the ldapsearch command line program." + "The name of the ldapsearch command line program." :type '(string :tag "`ldapsearch' Program") :group 'ldap) (defcustom ldap-ldapsearch-args '("-LL" "-tt") - "*A list of additional arguments to pass to `ldapsearch'." + "A list of additional arguments to pass to `ldapsearch'." :type '(repeat :tag "`ldapsearch' Arguments" (string :tag "Argument")) :group 'ldap) (defcustom ldap-ignore-attribute-codings nil - "*If non-nil, do not encode/decode LDAP attribute values." + "If non-nil, do not encode/decode LDAP attribute values." :type 'boolean :group 'ldap) (defcustom ldap-default-attribute-decoder nil - "*Decoder function to use for attributes whose syntax is unknown." + "Decoder function to use for attributes whose syntax is unknown." :type 'symbol :group 'ldap) (defcustom ldap-coding-system 'utf-8 - "*Coding system of LDAP string values. + "Coding system of LDAP string values. LDAP v3 specifies the coding system of strings to be UTF-8." :type 'symbol :group 'ldap) === modified file 'lisp/net/rcompile.el' --- lisp/net/rcompile.el 2010-01-13 08:35:10 +0000 +++ lisp/net/rcompile.el 2010-09-23 06:42:45 +0000 @@ -1,7 +1,7 @@ ;;; rcompile.el --- run a compilation on a remote machine -;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Albert ;; Maintainer: FSF @@ -75,7 +75,7 @@ (defcustom remote-compile-host nil - "*Host for remote compilations." + "Host for remote compilations." :type '(choice string (const nil)) :group 'remote-compile) @@ -86,7 +86,7 @@ :group 'remote-compile) (defcustom remote-compile-run-before nil - "*Command to run before compilation. + "Command to run before compilation. This can be used for setting up environment variables, since rsh does not invoke the shell as a login shell and files like .login \(tcsh\) and .bash_profile \(bash\) are not run. @@ -95,12 +95,12 @@ :group 'remote-compile) (defcustom remote-compile-prompt-for-host nil - "*Non-nil means prompt for host if not available from filename." + "Non-nil means prompt for host if not available from filename." :type 'boolean :group 'remote-compile) (defcustom remote-compile-prompt-for-user nil - "*Non-nil means prompt for user if not available from filename." + "Non-nil means prompt for user if not available from filename." :type 'boolean :group 'remote-compile) === modified file 'lisp/net/rlogin.el' --- lisp/net/rlogin.el 2010-05-05 04:27:16 +0000 +++ lisp/net/rlogin.el 2010-09-23 06:42:45 +0000 @@ -1,7 +1,8 @@ ;;; rlogin.el --- remote login interface ;; Copyright (C) 1992, 1993, 1994, 1995, 1997, 1998, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Noah Friedman ;; Maintainer: Noah Friedman @@ -45,17 +46,17 @@ :group 'unix) (defcustom rlogin-program "rlogin" - "*Name of program to invoke rlogin" + "Name of program to invoke rlogin" :type 'string :group 'rlogin) (defcustom rlogin-explicit-args nil - "*List of arguments to pass to rlogin on the command line." + "List of arguments to pass to rlogin on the command line." :type '(repeat (string :tag "Argument")) :group 'rlogin) (defcustom rlogin-mode-hook nil - "*Hooks to run after setting current buffer to rlogin-mode." + "Hooks to run after setting current buffer to rlogin-mode." :type 'hook :group 'rlogin) @@ -68,7 +69,7 @@ (string-match "-solaris2" system-configuration)) t) (t nil))) - "*If non-nil, use a pty for the local rlogin process. + "If non-nil, use a pty for the local rlogin process. If nil, use a pipe (if pipes are supported on the local system). Generally it is better not to waste ptys on systems which have a static @@ -79,7 +80,7 @@ :group 'rlogin) (defcustom rlogin-directory-tracking-mode 'local - "*Control whether and how to do directory tracking in an rlogin buffer. + "Control whether and how to do directory tracking in an rlogin buffer. nil means don't do directory tracking. @@ -103,12 +104,12 @@ (make-variable-buffer-local 'rlogin-directory-tracking-mode) (defcustom rlogin-host nil - "*The name of the remote host. This variable is buffer-local." + "The name of the remote host. This variable is buffer-local." :type '(choice (const nil) string) :group 'rlogin) (defcustom rlogin-remote-user nil - "*The username used on the remote host. + "The username used on the remote host. This variable is buffer-local and defaults to your local user name. If rlogin is invoked with the `-l' option to specify the remote username, this variable is set from that." === modified file 'lisp/textmodes/enriched.el' --- lisp/textmodes/enriched.el 2010-01-13 08:35:10 +0000 +++ lisp/textmodes/enriched.el 2010-09-23 06:42:45 +0000 @@ -1,7 +1,7 @@ ;;; enriched.el --- read and save files in text/enriched format -;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Boris Goldowsky ;; Keywords: wp, faces @@ -50,7 +50,7 @@ :group 'wp) (defcustom enriched-verbose t - "*If non-nil, give status messages when reading and writing files." + "If non-nil, give status messages when reading and writing files." :type 'boolean :group 'enriched) === modified file 'lisp/textmodes/makeinfo.el' --- lisp/textmodes/makeinfo.el 2010-01-13 08:35:10 +0000 +++ lisp/textmodes/makeinfo.el 2010-09-23 06:42:45 +0000 @@ -1,7 +1,7 @@ ;;; makeinfo.el --- run makeinfo conveniently -;; Copyright (C) 1991, 1993, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1991, 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Robert J. Chassell ;; Maintainer: FSF @@ -58,13 +58,13 @@ (defcustom makeinfo-run-command "makeinfo" - "*Command used to run `makeinfo' subjob. + "Command used to run `makeinfo' subjob. The name of the file is appended to this string, separated by a space." :type 'string :group 'makeinfo) (defcustom makeinfo-options "--fill-column=70" - "*String containing options for running `makeinfo'. + "String containing options for running `makeinfo'. Do not include `--footnote-style' or `--paragraph-indent'; the proper way to specify those is with the Texinfo commands `@footnotestyle` and `@paragraphindent'." === modified file 'lisp/textmodes/page-ext.el' --- lisp/textmodes/page-ext.el 2010-01-13 08:35:10 +0000 +++ lisp/textmodes/page-ext.el 2010-09-23 06:42:45 +0000 @@ -1,7 +1,7 @@ ;;; page-ext.el --- extended page handling commands -;; Copyright (C) 1990, 1991, 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, -;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1991, 1993, 1994, 2001, 2002, 2003, 2004, 2005, +;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Robert J. Chassell ;; (according to ack.texi) @@ -242,17 +242,17 @@ (defcustom pages-directory-buffer-narrowing-p t - "*If non-nil, `pages-directory-goto' narrows pages buffer to entry." + "If non-nil, `pages-directory-goto' narrows pages buffer to entry." :type 'boolean :group 'pages) (defcustom pages-directory-for-adding-page-narrowing-p t - "*If non-nil, `add-new-page' narrows page buffer to new entry." + "If non-nil, `add-new-page' narrows page buffer to new entry." :type 'boolean :group 'pages) (defcustom pages-directory-for-adding-new-page-before-current-page-p t - "*If non-nil, `add-new-page' inserts new page before current page." + "If non-nil, `add-new-page' inserts new page before current page." :type 'boolean :group 'pages) @@ -260,23 +260,23 @@ ;;; Addresses related variables (defcustom pages-addresses-file-name "~/addresses" - "*Standard name for file of addresses. Entries separated by page-delimiter. + "Standard name for file of addresses. Entries separated by page-delimiter. Used by `pages-directory-for-addresses' function." :type 'file :group 'pages) (defcustom pages-directory-for-addresses-goto-narrowing-p t - "*If non-nil, `pages-directory-goto' narrows addresses buffer to entry." + "If non-nil, `pages-directory-goto' narrows addresses buffer to entry." :type 'boolean :group 'pages) (defcustom pages-directory-for-addresses-buffer-keep-windows-p t - "*If nil, `pages-directory-for-addresses' deletes other windows." + "If nil, `pages-directory-for-addresses' deletes other windows." :type 'boolean :group 'pages) (defcustom pages-directory-for-adding-addresses-narrowing-p t - "*If non-nil, `add-new-page' narrows addresses buffer to new entry." + "If non-nil, `add-new-page' narrows addresses buffer to new entry." :type 'boolean :group 'pages) === modified file 'lisp/textmodes/picture.el' --- lisp/textmodes/picture.el 2010-03-12 17:47:22 +0000 +++ lisp/textmodes/picture.el 2010-09-23 06:42:45 +0000 @@ -37,27 +37,27 @@ :group 'wp) (defcustom picture-rectangle-ctl ?+ - "*Character `picture-draw-rectangle' uses for top left corners." + "Character `picture-draw-rectangle' uses for top left corners." :type 'character :group 'picture) (defcustom picture-rectangle-ctr ?+ - "*Character `picture-draw-rectangle' uses for top right corners." + "Character `picture-draw-rectangle' uses for top right corners." :type 'character :group 'picture) (defcustom picture-rectangle-cbr ?+ - "*Character `picture-draw-rectangle' uses for bottom right corners." + "Character `picture-draw-rectangle' uses for bottom right corners." :type 'character :group 'picture) (defcustom picture-rectangle-cbl ?+ - "*Character `picture-draw-rectangle' uses for bottom left corners." + "Character `picture-draw-rectangle' uses for bottom left corners." :type 'character :group 'picture) (defcustom picture-rectangle-v ?| - "*Character `picture-draw-rectangle' uses for vertical lines." + "Character `picture-draw-rectangle' uses for vertical lines." :type 'character :group 'picture) (defcustom picture-rectangle-h ?- - "*Character `picture-draw-rectangle' uses for horizontal lines." + "Character `picture-draw-rectangle' uses for horizontal lines." :type 'character :group 'picture) @@ -363,7 +363,7 @@ ;; Picture Tabs (defcustom picture-tab-chars "!-~" - "*A character set which controls behavior of commands. + "A character set which controls behavior of commands. \\[picture-set-tab-stops] and \\[picture-tab-search]. It is NOT a regular expression, any regexp special characters will be quoted. It defines a set of \"interesting characters\" to look for when setting === modified file 'lisp/textmodes/refer.el' --- lisp/textmodes/refer.el 2010-01-13 08:35:10 +0000 +++ lisp/textmodes/refer.el 2010-09-23 06:42:45 +0000 @@ -1,7 +1,7 @@ ;;; refer.el --- look up references in bibliography files -;; Copyright (C) 1992, 1996, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Ashwin Ram ;; Maintainer: Gernot Heiser @@ -96,7 +96,7 @@ :group 'refer) (defcustom refer-bib-files 'dir - "*List of \\.bib files to search for references, + "List of \\.bib files to search for references, or one of the following special values: nil = prompt for \\.bib file (if visiting a \\.bib file, use it as default) auto = read \\.bib file names from appropriate command in buffer (see @@ -115,7 +115,7 @@ :group 'refer) (defcustom refer-cache-bib-files t - "*Variable determining whether the value of `refer-bib-files' should be cached. + "Variable determining whether the value of `refer-bib-files' should be cached. If t, initialize the value of refer-bib-files the first time it is used. If nil, re-read the list of \\.bib files depending on the value of `refer-bib-files' each time it is needed." @@ -123,7 +123,7 @@ :group 'refer) (defcustom refer-bib-files-regexp "\\\\bibliography" - "*Regexp matching a bibliography file declaration. + "Regexp matching a bibliography file declaration. The current buffer is expected to contain a line such as \\bibliography{file1,file2,file3} which is read to set up `refer-bib-files'. The regexp must specify the command === modified file 'lisp/textmodes/spell.el' --- lisp/textmodes/spell.el 2010-01-13 08:35:10 +0000 +++ lisp/textmodes/spell.el 2010-09-23 06:42:45 +0000 @@ -1,7 +1,7 @@ ;;; spell.el --- spelling correction interface for Emacs -;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, -;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: wp, unix @@ -37,12 +37,12 @@ :group 'applications) (defcustom spell-command "spell" - "*Command to run the spell program." + "Command to run the spell program." :type 'string :group 'spell) (defcustom spell-filter nil - "*Filter function to process text before passing it to spell program. + "Filter function to process text before passing it to spell program. This function might remove text-processor commands. nil means don't alter the text before checking it." :type '(choice (const nil) function) === modified file 'lisp/textmodes/table.el' --- lisp/textmodes/table.el 2010-05-25 02:11:08 +0000 +++ lisp/textmodes/table.el 2010-09-23 06:42:45 +0000 @@ -6,7 +6,7 @@ ;; Keywords: wp, convenience ;; Author: Takaaki Ota ;; Created: Sat Jul 08 2000 13:28:45 (PST) -;; Revised: Fri Aug 21 2009 00:16:58 (PDT) +;; Revised: Tue Sep 21 2010 12:42:03 (PDT) ;; This file is part of GNU Emacs. @@ -651,7 +651,7 @@ :group 'table) (defcustom table-time-before-update 0.2 - "*Time in seconds before updating the cell contents after typing. + "Time in seconds before updating the cell contents after typing. Updating the cell contents on the screen takes place only after this specified amount of time has passed after the last modification to the cell contents. When the contents of a table cell changes repetitively @@ -665,7 +665,7 @@ :group 'table) (defcustom table-time-before-reformat 0.2 - "*Time in seconds before reformatting the table. + "Time in seconds before reformatting the table. This many seconds must pass in addition to `table-time-before-update' before the table is updated with newly widened width or heightened height." @@ -674,7 +674,7 @@ :group 'table) (defcustom table-command-prefix [(control c) (control c)] - "*Key sequence to be used as prefix for table command key bindings." + "Key sequence to be used as prefix for table command key bindings." :type '(vector (repeat :inline t sexp)) :tag "Table Command Prefix" :group 'table) @@ -685,30 +685,30 @@ (((class color)) (:foreground "gray90" :background "blue")) (t (:bold t))) - "*Face used for table cell contents." + "Face used for table cell contents." :tag "Cell Face" :group 'table) (defcustom table-cell-horizontal-chars "-=" - "*Characters that may be used for table cell's horizontal border line." + "Characters that may be used for table cell's horizontal border line." :tag "Cell Horizontal Boundary Characters" :type 'string :group 'table) (defcustom table-cell-vertical-char ?\| - "*Character that forms table cell's vertical border line." + "Character that forms table cell's vertical border line." :tag "Cell Vertical Boundary Character" :type 'character :group 'table) (defcustom table-cell-intersection-char ?\+ - "*Character that forms table cell's corner." + "Character that forms table cell's corner." :tag "Cell Intersection Character" :type 'character :group 'table) (defcustom table-word-continuation-char ?\\ - "*Character that indicates word continuation into the next line. + "Character that indicates word continuation into the next line. This character has a special meaning only in the fixed width mode, that is when `table-fixed-width-mode' is non-nil . In the fixed width mode this character indicates that the location is continuing into the @@ -727,7 +727,7 @@ (set variable value)) (defcustom table-fixed-width-mode nil - "*Cell width is fixed when this is non-nil. + "Cell width is fixed when this is non-nil. Normally it should be nil for allowing automatic cell width expansion that widens a cell when it is necessary. When non-nil, typing in a cell does not automatically expand the cell width. A word that is too @@ -742,7 +742,7 @@ :group 'table) (defcustom table-detect-cell-alignment t - "*Detect cell contents alignment automatically. + "Detect cell contents alignment automatically. When non-nil cell alignment is automatically determined by the appearance of the current cell contents when recognizing tables as a whole. This applies to `table-recognize', `table-recognize-region' @@ -752,38 +752,38 @@ :group 'table) (defcustom table-dest-buffer-name "table" - "*Default buffer name (without a suffix) for source generation." + "Default buffer name (without a suffix) for source generation." :tag "Source Buffer Name" :type 'string :group 'table) (defcustom table-html-delegate-spacing-to-user-agent nil - "*Non-nil delegates cell contents spacing entirely to user agent. + "Non-nil delegates cell contents spacing entirely to user agent. Otherwise, when nil, it preserves the original spacing and line breaks." :tag "HTML delegate spacing" :type 'boolean :group 'table) (defcustom table-html-th-rows 0 - "*Number of top rows to become header cells automatically in HTML generation." + "Number of top rows to become header cells automatically in HTML generation." :tag "HTML Header Rows" :type 'integer :group 'table) (defcustom table-html-th-columns 0 - "*Number of left columns to become header cells automatically in HTML generation." + "Number of left columns to become header cells automatically in HTML generation." :tag "HTML Header Columns" :type 'integer :group 'table) (defcustom table-html-table-attribute "border=\"1\"" - "*Table attribute that applies to the table in HTML generation." + "Table attribute that applies to the table in HTML generation." :tag "HTML table attribute" :type 'string :group 'table) (defcustom table-html-cell-attribute "" - "*Cell attribute that applies to all cells in HTML generation. + "Cell attribute that applies to all cells in HTML generation. Do not specify \"align\" and \"valign\" because they are determined by the cell contents dynamically." :tag "HTML cell attribute" @@ -791,28 +791,28 @@ :group 'table) (defcustom table-cals-thead-rows 1 - "*Number of top rows to become header rows in CALS table." + "Number of top rows to become header rows in CALS table." :tag "CALS Header Rows" :type 'integer :group 'table) ;;;###autoload (defcustom table-cell-map-hook nil - "*Normal hooks run when finishing construction of `table-cell-map'. + "Normal hooks run when finishing construction of `table-cell-map'. User can modify `table-cell-map' by adding custom functions here." :tag "Cell Keymap Hooks" :type 'hook :group 'table-hooks) (defcustom table-disable-incompatibility-warning nil - "*Disable compatibility warning notice. + "Disable compatibility warning notice. When nil user is reminded of known incompatible issues." :tag "Disable Incompatibility Warning" :type 'boolean :group 'table) (defcustom table-abort-recognition-when-input-pending t - "*Abort current recognition process when input pending. + "Abort current recognition process when input pending. Abort current recognition process when we are not sure that no input is available. When non-nil lengthy recognition process is aborted simply by any key input." @@ -822,19 +822,19 @@ ;;;###autoload (defcustom table-load-hook nil - "*List of functions to be called after the table is first loaded." + "List of functions to be called after the table is first loaded." :type 'hook :group 'table-hooks) ;;;###autoload (defcustom table-point-entered-cell-hook nil - "*List of functions to be called after point entered a table cell." + "List of functions to be called after point entered a table cell." :type 'hook :group 'table-hooks) ;;;###autoload (defcustom table-point-left-cell-hook nil - "*List of functions to be called after point left a table cell." + "List of functions to be called after point left a table cell." :type 'hook :group 'table-hooks) @@ -860,7 +860,7 @@ ;;; No need of user configuration (defconst table-paragraph-start "[ \t\n\f]" - "*Regexp for beginning of a line that starts OR separates paragraphs.") + "Regexp for beginning of a line that starts OR separates paragraphs.") (defconst table-cache-buffer-name " *table cell cache*" "Cell cache buffer name.") (defvar table-cell-info-lu-coordinate nil === modified file 'lisp/textmodes/tex-mode.el' --- lisp/textmodes/tex-mode.el 2010-09-18 00:35:00 +0000 +++ lisp/textmodes/tex-mode.el 2010-09-23 06:42:45 +0000 @@ -58,14 +58,14 @@ ;;;###autoload (defcustom tex-shell-file-name nil - "*If non-nil, the shell file name to run in the subshell used to run TeX." + "If non-nil, the shell file name to run in the subshell used to run TeX." :type '(choice (const :tag "None" nil) string) :group 'tex-run) ;;;###autoload (defcustom tex-directory (purecopy ".") - "*Directory in which temporary files are written. + "Directory in which temporary files are written. You can make this `/tmp' if your TEXINPUTS has no relative directories in it and you don't try to apply \\[tex-region] or \\[tex-buffer] when there are `\\input' commands with relative directories." @@ -84,7 +84,7 @@ ;;;###autoload (defcustom tex-main-file nil - "*The main TeX source file which includes this buffer's file. + "The main TeX source file which includes this buffer's file. The command `tex-file' runs TeX on the file specified by `tex-main-file' if the variable is non-nil." :type '(choice (const :tag "None" nil) @@ -93,13 +93,13 @@ ;;;###autoload (defcustom tex-offer-save t - "*If non-nil, ask about saving modified buffers before \\[tex-file] is run." + "If non-nil, ask about saving modified buffers before \\[tex-file] is run." :type 'boolean :group 'tex-file) ;;;###autoload (defcustom tex-run-command (purecopy "tex") - "*Command used to run TeX subjob. + "Command used to run TeX subjob. TeX Mode sets `tex-command' to this string. See the documentation of that variable." :type 'string @@ -107,7 +107,7 @@ ;;;###autoload (defcustom latex-run-command (purecopy "latex") - "*Command used to run LaTeX subjob. + "Command used to run LaTeX subjob. LaTeX Mode sets `tex-command' to this string. See the documentation of that variable." :type 'string @@ -115,7 +115,7 @@ ;;;###autoload (defcustom slitex-run-command (purecopy "slitex") - "*Command used to run SliTeX subjob. + "Command used to run SliTeX subjob. SliTeX Mode sets `tex-command' to this string. See the documentation of that variable." :type 'string @@ -123,7 +123,7 @@ ;;;###autoload (defcustom tex-start-options (purecopy "") - "*TeX options to use when starting TeX. + "TeX options to use when starting TeX. These immediately precede the commands in `tex-start-commands' and the input file name, with no separating space and are not shell-quoted. If nil, TeX runs with no options. See the documentation of `tex-command'." @@ -133,7 +133,7 @@ ;;;###autoload (defcustom tex-start-commands (purecopy "\\nonstopmode\\input") - "*TeX commands to use when starting TeX. + "TeX commands to use when starting TeX. They are shell-quoted and precede the input file name, with a separating space. If nil, no commands are used. See the documentation of `tex-command'." :type '(radio (const :tag "Interactive \(nil\)" nil) @@ -157,14 +157,14 @@ ;;;###autoload (defcustom latex-block-names nil - "*User defined LaTeX block names. + "User defined LaTeX block names. Combined with `latex-standard-block-names' for minibuffer completion." :type '(repeat string) :group 'tex-run) ;;;###autoload (defcustom tex-bibtex-command (purecopy "bibtex") - "*Command used by `tex-bibtex-file' to gather bibliographic data. + "Command used by `tex-bibtex-file' to gather bibliographic data. If this string contains an asterisk (`*'), that is replaced by the file name; otherwise, the file name, preceded by blank, is added at the end." :type 'string @@ -172,7 +172,7 @@ ;;;###autoload (defcustom tex-dvi-print-command (purecopy "lpr -d") - "*Command used by \\[tex-print] to print a .dvi file. + "Command used by \\[tex-print] to print a .dvi file. If this string contains an asterisk (`*'), that is replaced by the file name; otherwise, the file name, preceded by blank, is added at the end." :type 'string @@ -180,7 +180,7 @@ ;;;###autoload (defcustom tex-alt-dvi-print-command (purecopy "lpr -d") - "*Command used by \\[tex-print] with a prefix arg to print a .dvi file. + "Command used by \\[tex-print] with a prefix arg to print a .dvi file. If this string contains an asterisk (`*'), that is replaced by the file name; otherwise, the file name, preceded by blank, is added at the end. @@ -203,7 +203,7 @@ ((eq window-system 'x) ,(purecopy "xdvi")) ((eq window-system 'w32) ,(purecopy "yap")) (t ,(purecopy "dvi2tty * | cat -s"))) - "*Command used by \\[tex-view] to display a `.dvi' file. + "Command used by \\[tex-view] to display a `.dvi' file. If it is a string, that specifies the command directly. If this string contains an asterisk (`*'), that is replaced by the file name; otherwise, the file name, preceded by a space, is added at the end. @@ -214,14 +214,14 @@ ;;;###autoload (defcustom tex-show-queue-command (purecopy "lpq") - "*Command used by \\[tex-show-print-queue] to show the print queue. + "Command used by \\[tex-show-print-queue] to show the print queue. Should show the queue(s) that \\[tex-print] puts jobs on." :type 'string :group 'tex-view) ;;;###autoload (defcustom tex-default-mode 'latex-mode - "*Mode to enter for a new file that might be either TeX or LaTeX. + "Mode to enter for a new file that might be either TeX or LaTeX. This variable is used when it can't be determined whether the file is plain TeX or LaTeX or what because the file contains no commands. Normally set to either `plain-tex-mode' or `latex-mode'." @@ -230,14 +230,14 @@ ;;;###autoload (defcustom tex-open-quote (purecopy "``") - "*String inserted by typing \\[tex-insert-quote] to open a quotation." + "String inserted by typing \\[tex-insert-quote] to open a quotation." :type 'string :options '("``" "\"<" "\"`" "<<" "«") :group 'tex) ;;;###autoload (defcustom tex-close-quote (purecopy "''") - "*String inserted by typing \\[tex-insert-quote] to close a quotation." + "String inserted by typing \\[tex-insert-quote] to close a quotation." :type 'string :options '("''" "\">" "\"'" ">>" "»") :group 'tex) @@ -327,7 +327,7 @@ ;;;; (defcustom latex-imenu-indent-string ". " - "*String to add repeated in front of nested sectional units for Imenu. + "String to add repeated in front of nested sectional units for Imenu. An alternative value is \" . \", if you use a font with a narrow period." :type 'string :group 'tex) === modified file 'lisp/textmodes/two-column.el' --- lisp/textmodes/two-column.el 2010-01-13 08:35:10 +0000 +++ lisp/textmodes/two-column.el 2010-09-23 06:42:45 +0000 @@ -209,19 +209,19 @@ (defcustom 2C-mode-line-format '("-%*- %15b --" (-3 . "%p") "--%[(" mode-name minor-mode-alist "%n" mode-line-process ")%]%-") - "*Value of `mode-line-format' for a buffer in two-column minor mode." + "Value of `mode-line-format' for a buffer in two-column minor mode." :type 'sexp :group 'two-column) (defcustom 2C-other-buffer-hook 'text-mode - "*Hook run in new buffer when it is associated with current one." + "Hook run in new buffer when it is associated with current one." :type 'function :group 'two-column) (defcustom 2C-separator "" - "*A string inserted between the two columns when merging. + "A string inserted between the two columns when merging. This gets set locally by \\[2C-split]." :type 'string :group 'two-column) @@ -230,7 +230,7 @@ (defcustom 2C-window-width 40 - "*The width of the first column. (Must be at least `window-min-width') + "The width of the first column. (Must be at least `window-min-width') This value is local for every buffer that sets it." :type 'integer :group 'two-column) @@ -240,7 +240,7 @@ (defcustom 2C-beyond-fill-column 4 - "*Base for calculating `fill-column' for a buffer in two-column minor mode. + "Base for calculating `fill-column' for a buffer in two-column minor mode. The value of `fill-column' becomes `2C-window-width' for this buffer minus this value." :type 'integer ------------------------------------------------------------ revno: 101552 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-09-22 23:08:57 -0700 message: * lisp/url/url-cache.el (url-cache-expire-time): Doc fix. diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2010-09-23 05:59:20 +0000 +++ lisp/url/ChangeLog 2010-09-23 06:08:57 +0000 @@ -2,6 +2,7 @@ * url-cache.el (url-cache-expired): Don't autoload. Tweak previous change. + (url-cache-expire-time): Doc fix. 2010-09-23 Julien Danjou === modified file 'lisp/url/url-cache.el' --- lisp/url/url-cache.el 2010-09-23 06:04:01 +0000 +++ lisp/url/url-cache.el 2010-09-23 06:08:57 +0000 @@ -33,7 +33,8 @@ :group 'url-file) (defcustom url-cache-expire-time 3600 - "Maximum time in seconds to keep the documents cached." + "Default maximum time in seconds before cache files expire. +Used by the function `url-cache-expired'." :version "24.1" :type 'integer :group 'url-cache) ------------------------------------------------------------ revno: 101551 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-09-22 23:04:01 -0700 message: Fix previous url-cache fix. diff: === modified file 'lisp/url/url-cache.el' --- lisp/url/url-cache.el 2010-09-23 05:59:20 +0000 +++ lisp/url/url-cache.el 2010-09-23 06:04:01 +0000 @@ -198,12 +198,12 @@ (if url-standalone-mode (not (file-exists-p (url-cache-create-filename url))) (let ((cache-time (url-is-cached url))) - (and cache-time - (time-less-p - (time-add - cache-time - (seconds-to-time (or expire-time url-cache-expire-time))) - (current-time)))))) + (or (not cache-time) + (time-less-p + (time-add + cache-time + (seconds-to-time (or expire-time url-cache-expire-time))) + (current-time)))))) (provide 'url-cache) ------------------------------------------------------------ revno: 101550 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-09-22 22:59:20 -0700 message: * url-cache.el (url-cache-expired): Don't autoload. Tweak previous change. diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2010-09-23 05:56:17 +0000 +++ lisp/url/ChangeLog 2010-09-23 05:59:20 +0000 @@ -1,3 +1,8 @@ +2010-09-23 Glenn Morris + + * url-cache.el (url-cache-expired): Don't autoload. + Tweak previous change. + 2010-09-23 Julien Danjou * url-cache.el (url-cache-expire-time): New option. === modified file 'lisp/url/url-cache.el' --- lisp/url/url-cache.el 2010-09-23 05:56:17 +0000 +++ lisp/url/url-cache.el 2010-09-23 05:59:20 +0000 @@ -191,20 +191,19 @@ (erase-buffer) (insert-file-contents-literally fnam)) -;;;###autoload (defun url-cache-expired (url &optional expire-time) - "Return t if a cached URL is more than EXPIRE-TIME old. -If EXPIRE-TIME is not set, `url-cache-expire-time' is used instead." - (cond (url-standalone-mode - (not (file-exists-p (url-cache-create-filename url)))) - (t (let ((cache-time (url-is-cached url))) - (if cache-time - (time-less-p - (time-add - (url-is-cached url) - (seconds-to-time (or expire-time url-cache-expire-time))) - (current-time)) - t))))) + "Return non-nil if a cached URL is older than EXPIRE-TIME seconds. +The default value of EXPIRE-TIME is `url-cache-expire-time'. +If `url-standalone-mode' is non-nil, cached items never expire." + (if url-standalone-mode + (not (file-exists-p (url-cache-create-filename url))) + (let ((cache-time (url-is-cached url))) + (and cache-time + (time-less-p + (time-add + cache-time + (seconds-to-time (or expire-time url-cache-expire-time))) + (current-time)))))) (provide 'url-cache) ------------------------------------------------------------ revno: 101549 author: Julien Danjou committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-09-22 22:56:17 -0700 message: Small url-cache update. * lisp/url/url-cache.el (url-cache-expire-time): New option. (url-cache-expired): Rewrite. diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2010-09-19 18:48:11 +0000 +++ lisp/url/ChangeLog 2010-09-23 05:56:17 +0000 @@ -1,3 +1,8 @@ +2010-09-23 Julien Danjou + + * url-cache.el (url-cache-expire-time): New option. + (url-cache-expired): Rewrite. + 2010-09-19 Julien Danjou * url-cache.el (url-fetch-from-cache): New function. === modified file 'lisp/url/url-cache.el' --- lisp/url/url-cache.el 2010-09-19 18:48:11 +0000 +++ lisp/url/url-cache.el 2010-09-23 05:56:17 +0000 @@ -32,6 +32,12 @@ :type 'directory :group 'url-file) +(defcustom url-cache-expire-time 3600 + "Maximum time in seconds to keep the documents cached." + :version "24.1" + :type 'integer + :group 'url-cache) + ;; Cache manager (defun url-cache-file-writable-p (file) "Follows the documentation of `file-writable-p', unlike `file-writable-p'." @@ -186,21 +192,19 @@ (insert-file-contents-literally fnam)) ;;;###autoload -(defun url-cache-expired (url mod) - "Return t if a cached file has expired." - (let* ((urlobj (if (vectorp url) url (url-generic-parse-url url))) - (type (url-type urlobj))) - (cond - (url-standalone-mode - (not (file-exists-p (url-cache-create-filename url)))) - ((string= type "http") - t) - ((member type '("file" "ftp")) - (if (or (equal mod '(0 0)) (not mod)) - t - (or (> (nth 0 mod) (nth 0 (current-time))) - (> (nth 1 mod) (nth 1 (current-time)))))) - (t nil)))) +(defun url-cache-expired (url &optional expire-time) + "Return t if a cached URL is more than EXPIRE-TIME old. +If EXPIRE-TIME is not set, `url-cache-expire-time' is used instead." + (cond (url-standalone-mode + (not (file-exists-p (url-cache-create-filename url)))) + (t (let ((cache-time (url-is-cached url))) + (if cache-time + (time-less-p + (time-add + (url-is-cached url) + (seconds-to-time (or expire-time url-cache-expire-time))) + (current-time)) + t))))) (provide 'url-cache) ------------------------------------------------------------ revno: 101548 author: Teodor Zlatanov committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2010-09-23 03:57:10 +0000 message: netrc.el (netrc-parse): Remove encrypt.el mentions. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-09-23 00:30:37 +0000 +++ lisp/ChangeLog 2010-09-23 03:57:10 +0000 @@ -1,3 +1,7 @@ +2010-09-23 Teodor Zlatanov + + * net/netrc.el (netrc-parse): Remove encrypt.el mentions. + 2010-09-22 Dan Christensen * calendar/time-date.el (date-to-time): Try using parse-time-string === modified file 'lisp/net/netrc.el' --- lisp/net/netrc.el 2010-09-18 10:02:19 +0000 +++ lisp/net/netrc.el 2010-09-23 03:57:10 +0000 @@ -34,14 +34,10 @@ ;;; .netrc and .authinfo rc parsing ;;; -;; use encrypt if loaded (encrypt-file-alist has to be set as well) -(autoload 'encrypt-find-model "encrypt") -(autoload 'encrypt-insert-file-contents "encrypt") (defalias 'netrc-point-at-eol (if (fboundp 'point-at-eol) 'point-at-eol 'line-end-position)) -(defvar encrypt-file-alist) (eval-when-compile ;; This is unnecessary in the compiled version as it is a macro. (if (fboundp 'bound-and-true-p) @@ -74,12 +70,8 @@ (let ((tokens '("machine" "default" "login" "password" "account" "macdef" "force" "port")) - (encryption-model (when (netrc-bound-and-true-p encrypt-file-alist) - (encrypt-find-model file))) alist elem result pair) - (if encryption-model - (encrypt-insert-file-contents file encryption-model) - (insert-file-contents file)) + (insert-file-contents file) (goto-char (point-min)) ;; Go through the file, line by line. (while (not (eobp)) ------------------------------------------------------------ revno: 101547 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2010-09-23 01:51:43 +0000 message: nnimap.el (nnimap-update-info): Sync non-standard flags from the server in symbolic form. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-09-23 00:58:01 +0000 +++ lisp/gnus/ChangeLog 2010-09-23 01:51:43 +0000 @@ -1,5 +1,8 @@ 2010-09-23 Lars Magne Ingebrigtsen + * nnimap.el (nnimap-update-info): Sync non-standard flags from the + server in symbolic form. + * gnus-html.el (gnus-max-image-proportion): Increase proportion to 0.9. === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2010-09-23 00:30:37 +0000 +++ lisp/gnus/nnimap.el 2010-09-23 01:51:43 +0000 @@ -825,6 +825,7 @@ (new-marks (gnus-compress-sequence (cdr (or (assoc (caddr type) flags) ; %Flagged + (assoc (intern (cadr type) obarray) flags) (assoc (cadr type) flags)))))) ; "\Flagged" (setq marks (delq old-marks marks)) (pop old-marks) ------------------------------------------------------------ revno: 101546 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2010-09-23 00:58:01 +0000 message: gnus-html.el: Embiggen pictures slightly. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-09-23 00:30:37 +0000 +++ lisp/gnus/ChangeLog 2010-09-23 00:58:01 +0000 @@ -1,3 +1,8 @@ +2010-09-23 Lars Magne Ingebrigtsen + + * gnus-html.el (gnus-max-image-proportion): Increase proportion to + 0.9. + 2010-09-22 Lars Magne Ingebrigtsen * nnimap.el (nnimap-parse-flags): Parse the data in any order. === modified file 'lisp/gnus/gnus-html.el' --- lisp/gnus/gnus-html.el 2010-09-23 00:30:37 +0000 +++ lisp/gnus/gnus-html.el 2010-09-23 00:58:01 +0000 @@ -62,7 +62,7 @@ :group 'gnus-art :type 'regexp) -(defcustom gnus-max-image-proportion 0.7 +(defcustom gnus-max-image-proportion 0.9 "How big pictures displayed are in relation to the window they're in. A value of 0.7 means that they are allowed to take up 70% of the width and height of the window. If they are larger than this, ------------------------------------------------------------ revno: 101545 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2010-09-23 00:30:37 +0000 message: Merge Changes made in Gnus trunk. gnus-html.el (gnus-html-get-image-data): Search also for \r\n\r\n to get the start of data. gnus-html.el: Use gnus-html-encode-url to encode URL. gnus-sum.el (gnus-update-marks): Add sanity check to not delete marks outside the active range. gnus.el: Try to keep the server/method cache unique. gnus-html.el (gnus-html-rescale-image): Use window-inside-pixel-edges rather than window-pixel-edges. gnus-html.el (gnus-html-put-image): Stop using markers. gnus-html.el (gnus-html-image-fetched): Search also for \r\n\r\n to get the start of data. nnimap.el: Expunge IMAP groups by default on article deletion. gnus-int.el (gnus-request-expire-articles): Inhibit the daemon, since this command might take a while. nnimap.el (nnimap-request-list): Set the current nnimap group to nil, since EXAMINE changes it on the server. nnmail.el, nnimap.el: Allow nnimap to just delete 'junk messages when splitting. nnimap.el (nnimap-parse-flags): Make IMAP flags parsing much faster by using `read'. nnimap.el (nnimap-make-process-buffer): Record the server name. gnus-html.el (gnus-html-image-fetched): Only cache if gnus-html-image-automatic-caching is set. gnus-html.el (gnus-html-image-fetched): Check for errors. gnus-start.el (gnus-read-active-for-groups): Only run -request-scan once per method on `g'. nnimap.el (nnimap-request-expire-articles): If nnmail-expiry-wait is immediate, then expire all articles. gnus-group.el (gnus-group-get-icon): Compute icon to return. gnus-group.el (gnus-group-icon-list): Fix bad docstring information. nnimap.el (nnimap-update-info): Fix up various off-by-one errors when syncing flags in nnimap. time-date.el (date-to-time): Speed up date-to-time. gnus-start.el (gnus-get-unread-articles): Don't have `gnus-get-unread-articles-in-group' update info. gnus-group.el: Remove gnus-group-highlight-line from the default hook list. gnus-group.el (gnus-group-highlight-line): Typo fix: beg, not start. gnus-group.el (gnus-group-insert-group-line): Pass the real group name so that it gets the right data. gnus-int.el (gnus-open-server): Add tracing for performance debugging. nnimap.el (nnimap-parse-flags): Parse the data in any order. nnimap.el (nnimap-update-info): Fix up code slightly. diff: === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2010-09-21 23:13:46 +0000 +++ doc/misc/gnus.texi 2010-09-23 00:30:37 +0000 @@ -1996,8 +1996,7 @@ @vindex gnus-group-update-hook @findex gnus-group-highlight-line @code{gnus-group-update-hook} is called when a group line is changed. -It will not be called when @code{gnus-visual} is @code{nil}. This hook -calls @code{gnus-group-highlight-line} by default. +It will not be called when @code{gnus-visual} is @code{nil}. @node Group Maneuvering === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-09-22 05:19:14 +0000 +++ lisp/ChangeLog 2010-09-23 00:30:37 +0000 @@ -1,3 +1,8 @@ +2010-09-22 Dan Christensen + + * calendar/time-date.el (date-to-time): Try using parse-time-string + first before using the slower timezone-make-date-arpa-standard. + 2010-09-22 Katsumi Yamaoka * calendar/time-date.el (format-seconds): Comment fix. === modified file 'lisp/calendar/time-date.el' --- lisp/calendar/time-date.el 2010-09-22 05:19:14 +0000 +++ lisp/calendar/time-date.el 2010-09-23 00:30:37 +0000 @@ -97,20 +97,20 @@ (autoload 'timezone-make-date-arpa-standard "timezone") ;;;###autoload +;; `parse-time-string' isn't sufficiently general or robust. It fails +;; to grok some of the formats that timezone does (e.g. dodgy +;; post-2000 stuff from some Elms) and either fails or returns bogus +;; values. timezone-make-date-arpa-standard should help. (defun date-to-time (date) "Parse a string DATE that represents a date-time and return a time value. If DATE lacks timezone information, GMT is assumed." (condition-case () - (apply 'encode-time - (parse-time-string - ;; `parse-time-string' isn't sufficiently general or - ;; robust. It fails to grok some of the formats that - ;; timezone does (e.g. dodgy post-2000 stuff from some - ;; Elms) and either fails or returns bogus values. Lars - ;; reverted this change, but that loses non-trivially - ;; often for me. -- fx - (timezone-make-date-arpa-standard date))) - (error (error "Invalid date: %s" date)))) + (apply 'encode-time (parse-time-string date)) + (error (condition-case () + (apply 'encode-time + (parse-time-string + (timezone-make-date-arpa-standard date))) + (error (error "Invalid date: %s" date)))))) ;; Bit of a mess. Emacs has float-time since at least 21.1. ;; This file is synced to Gnus, and XEmacs packages may have been written === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-09-22 13:34:37 +0000 +++ lisp/gnus/ChangeLog 2010-09-23 00:30:37 +0000 @@ -1,9 +1,112 @@ +2010-09-22 Lars Magne Ingebrigtsen + + * nnimap.el (nnimap-parse-flags): Parse the data in any order. + (nnimap-update-info): Fix up code slightly. + + * gnus-int.el (gnus-open-server): Add tracing for performance + debugging. + + * gnus-group.el (gnus-group-highlight-line): Typo fix: beg, not start. + (gnus-group-insert-group-line): Pass the real group name so that it + gets the right data. + + * gnus-start.el (gnus-get-unread-articles): Don't have + `gnus-get-unread-articles-in-group' update info, since that can be + really slow and doesn't seem to be needed? + +2010-09-22 Dan Christensen + + * time-date.el (date-to-time): Try using parse-time-string first before + using the slower timezone-make-date-arpa-standard. + +2010-09-22 Julien Danjou + + * gnus-group.el (gnus-group-insert-group-line): Call + gnus-group-highlight-line. + (gnus-group-update-hook): Remove gnus-group-highlight-line from the + default hook list. + (gnus-group-update-eval-form): Add new function. + (gnus-group-highlight-line): Use gnus-group-update-eval-form. + (gnus-group-get-icon): Use gnus-group-update-eval-form. + +2010-09-22 Lars Magne Ingebrigtsen + + * nnimap.el (nnimap-request-expire-articles): If nnmail-expiry-wait is + immediate, then expire all articles. + (nnimap-update-info): Fix off-by-one errors. + (nnimap-flags-to-marks): Would return no marks lists for group with no + flags. Instead return the other data. + +2010-09-22 Julien Danjou + + * gnus-group.el (gnus-group-get-icon): Renamed gnus-group-add-icon that + Only return an icon. + (gnus-group-insert-group-line): Compute icon to return. + + * gnus-html.el (gnus-html-image-automatic-caching): Add custom + variable. + (gnus-html-image-fetched): Only cache if + gnus-html-image-automatic-caching is set. + (gnus-html-image-fetched): Check for errors. + +2010-09-22 Lars Magne Ingebrigtsen + + * gnus-start.el (gnus-read-active-for-groups): Only run -request-scan + once per method on `g'. This ensures that backends like nnfolder don't + open all their folders. + + * nnimap.el (nnimap-split-incoming-mail): Delete 'junk. + (nnimap-request-list): Nix out group in the correct buffer. + (nnimap-parse-flags): Implement by using `read' instead of + hand-parsing. + (nnimap-flags-to-marks): Pass on permanent-flags. + (nnimap-make-process-buffer): Record the server name. + (nnimap-parse-flags): Fix typo. + (nnimap-request-scan): Run split on the server in general, not just a + single group. + + * nnmail.el (nnmail-split-incoming): Take an optional junk-func + parameter, and propagate this downwards. + + * nnimap.el (nnimap-request-list): Set the current nnimap group to nil, + since EXAMINE changes it on the server. + + * gnus-int.el (gnus-request-expire-articles): Inhibit the daemon, since + this command might take a while. + +2010-09-22 Julien Danjou + + * gnus-html.el (gnus-html-rescale-image): Use window-inside-pixel-edges + rather than window-pixel-edges. + (gnus-html-put-image): Stop using markers. They are harmful if you have + 2 images side-by-side, they can't be properly update on text deletion. + Using text-property is safer here. + (gnus-html-image-fetched): Search also for \r\n\r\n to get the start of + data. + +2010-09-22 Lars Magne Ingebrigtsen + + * nnimap.el (nnimap-expunge-inbox): Removed. + (nnimap-mark-and-expunge-incoming): Use nnimap-expunge instead. + (nnimap-expunge): Flip default to t. + + * gnus.el (gnus-method-to-server): Don't push things to the cache + unless it's unique. + (gnus-server-to-method): Ditto. + 2010-09-22 Teodor Zlatanov * nnimap.el (nnimap-delete-article): Tell user if expunge won't happen. 2010-09-22 Julien Danjou + * gnus-html.el (gnus-html-get-image-data): Search also for \r\n\r\n to + get the start of data. + (gnus-html-encode-url): Add this function to encode special chars in + URL. + (gnus-html-wash-images): Use gnus-html-encode-url to encode URL. + (gnus-html-prefetch-images): Use gnus-html-encode-url to encode URL. + * gnus-group.el (gnus-group-update-hook): Call gnus-group-add-icon by default. (gnus-group-add-icon): Move to gnus-group.el, and rewrite so it works. @@ -19,6 +122,19 @@ * nnir.el (nnir-run-find-grep) * pop3.el (pop3-list): Use 3rd arg of split-string. +2010-09-21 Lars Magne Ingebrigtsen + + * gnus-sum.el (gnus-update-marks): Add sanity check to not delete marks + outside the active range. Suggested by Dan Christensen. + + * gnus-start.el (gnus-get-unread-articles): Get the extended method + slightly later to avoid double-getting it. + + * nnml.el (nnml-generate-nov-file): Fix variable name clobbering from + previous patch. + + * gnus-sum.el (gnus-adjust-marked-articles): Fix another typo. + 2010-09-21 Adam Sjøgren * gnus-sum.el (gnus-adjust-marked-articles): Fix typo. @@ -103,6 +219,9 @@ 2010-09-20 Lars Magne Ingebrigtsen + * gnus-group.el (gnus-group-line-format-alist): Have the ?U (unseen) + spec inser "*" if the group isn't active instead of 0. + * nnimap.el (nnimap-request-group): Don't select the imap buffer before opening the server. (nnimap-request-delete-group): Implement group deletion. @@ -369,7 +488,7 @@ * dgnushack.el: Define netrc-credentials. -2010-09-17 Julien Danjou (tiny fix) +2010-09-17 Julien Danjou * mm-decode.el (mm-text-html-renderer): Document gnus-article-html. @@ -439,6 +558,9 @@ 2010-09-14 Lars Magne Ingebrigtsen + * gnus-registry.el (gnus-registry-install-shortcuts): The second + parameter to unintern is mandatory-ish in Emacs 24. + * gnus-html.el (gnus-html-schedule-image-fetching) (gnus-html-prefetch-images): Check for curl before using it. === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2010-09-22 12:49:48 +0000 +++ lisp/gnus/gnus-group.el 2010-09-23 00:30:37 +0000 @@ -292,14 +292,8 @@ :group 'gnus-exit :type 'hook) -(defcustom gnus-group-update-hook '(gnus-group-highlight-line gnus-group-add-icon) - "Hook called when a group line is changed. -The hook will not be called if `gnus-visual' is nil. - -The default functions `gnus-group-highlight-line' will highlight -the line according to the `gnus-group-highlight' variable, and -`gnus-group-add-icon' will add an icon according to -`gnus-group-icon-list'" +(defcustom gnus-group-update-hook nil + "Hook called when a group line is changed." :group 'gnus-group-visual :type 'hook) @@ -429,7 +423,6 @@ unread: The number of unread articles in the group. method: The select method used. mailp: Whether it's a mail group or not. -newsp: Whether it's a news group or not level: The level of the group. score: The score of the group. ticked: The number of ticked articles." @@ -1579,7 +1572,7 @@ ?m ? )) (gnus-tmp-moderated-string (if (eq gnus-tmp-moderated ?m) "(m)" "")) - (gnus-tmp-group-icon (propertize " " 'gnus-group-icon t)) + (gnus-tmp-group-icon (gnus-group-get-icon gnus-tmp-qualified-group)) (gnus-tmp-news-server (or (cadr gnus-tmp-method) "")) (gnus-tmp-news-method (or (car gnus-tmp-method) "")) (gnus-tmp-news-method-string @@ -1626,108 +1619,85 @@ 'gnus-tool-bar-update)) (forward-line -1) (when (inline (gnus-visual-p 'group-highlight 'highlight)) - (gnus-run-hooks 'gnus-group-update-hook)) + (gnus-group-highlight-line gnus-tmp-group beg end)) + (gnus-run-hooks 'gnus-group-update-hook) (forward-line) ;; Allow XEmacs to remove front-sticky text properties. (gnus-group-remove-excess-properties))) -(defun gnus-group-highlight-line () - "Highlight the current line according to `gnus-group-highlight'." - (let* ((list gnus-group-highlight) - (p (point)) - (end (point-at-eol)) - ;; now find out where the line starts and leave point there. - (beg (progn (beginning-of-line) (point))) - (group (gnus-group-group-name)) - (entry (gnus-group-entry group)) - (unread (if (numberp (car entry)) (car entry) 0)) - (active (gnus-active group)) - (total (if active (1+ (- (cdr active) (car active))) 0)) - (info (nth 2 entry)) - (method (inline (gnus-server-get-method group (gnus-info-method info)))) - (marked (gnus-info-marks info)) - (mailp (apply 'append - (mapcar - (lambda (x) - (memq x (assoc (symbol-name - (car (or method gnus-select-method))) - gnus-valid-select-methods))) - '(mail post-mail)))) - (level (or (gnus-info-level info) gnus-level-killed)) - (score (or (gnus-info-score info) 0)) - (ticked (gnus-range-length (cdr (assq 'tick marked)))) - (group-age (gnus-group-timestamp-delta group)) - (inhibit-read-only t)) - ;; FIXME: http://thread.gmane.org/gmane.emacs.gnus.general/65451/focus=65465 - ;; ====================================================================== - ;; From: Richard Stallman - ;; Subject: Re: Rewriting gnus-group-highlight-line (was: [...]) - ;; Cc: ding@gnus.org - ;; Date: Sat, 27 Oct 2007 19:41:20 -0400 - ;; Message-ID: - ;; - ;; [...] - ;; The kludge is that the alist elements contain expressions that refer - ;; to local variables with short names. Perhaps write your own tiny - ;; evaluator that handles just `and', `or', and numeric comparisons - ;; and just a few specific variables. - ;; ====================================================================== - ;; - ;; Similar for other evaluated variables. Grep for risky-local-variable - ;; to find them! -- rsteib - ;; - ;; Eval the cars of the lists until we find a match. - (while (and list - (not (eval (caar list)))) - (setq list (cdr list))) - (let ((face (cdar list))) - (unless (eq face (get-text-property beg 'face)) - (gnus-put-text-property-excluding-characters-with-faces - beg end 'face - (setq face (if (boundp face) (symbol-value face) face))) - (gnus-extent-start-open beg))) - (goto-char p))) - -(defun gnus-group-add-icon () - "Add an icon to the current line according to `gnus-group-icon-list'." - (save-excursion - (let* ((end (line-end-position)) - ;; now find out where the line starts and leave point there. - (beg (line-beginning-position))) - (save-restriction - (narrow-to-region beg end) - (goto-char beg) - (let ((mystart (text-property-any beg end 'gnus-group-icon t))) - (when mystart - (let* ((group (gnus-group-group-name)) - (entry (gnus-group-entry group)) - (unread (if (numberp (car entry)) (car entry) 0)) - (active (gnus-active group)) - (total (if active (1+ (- (cdr active) (car active))) 0)) - (info (nth 2 entry)) - (method (gnus-server-get-method group (gnus-info-method info))) - (marked (gnus-info-marks info)) - (mailp (memq 'mail (assoc (symbol-name - (car (or method gnus-select-method))) - gnus-valid-select-methods))) - (level (or (gnus-info-level info) gnus-level-killed)) - (score (or (gnus-info-score info) 0)) - (ticked (gnus-range-length (cdr (assq 'tick marked)))) - (group-age (gnus-group-timestamp-delta group)) - (inhibit-read-only t) - (list gnus-group-icon-list) - (myend (next-single-property-change - mystart 'gnus-group-icon))) - (while (and list - (not (eval (caar list)))) - (setq list (cdr list))) - (when list - (put-text-property - mystart myend - 'display - (append - (gnus-create-image (expand-file-name (cdar list))) - '(:ascent center))))))))))) +(defun gnus-group-update-eval-form (group list) + "Eval `car' of each element of LIST, and return the first that return t. +Some value are bound so the form can use them." + (when list + (let* ((entry (gnus-group-entry group)) + (unread (if (numberp (car entry)) (car entry) 0)) + (active (gnus-active group)) + (total (if active (1+ (- (cdr active) (car active))) 0)) + (info (nth 2 entry)) + (method (inline (gnus-server-get-method group (gnus-info-method info)))) + (marked (gnus-info-marks info)) + (mailp (apply 'append + (mapcar + (lambda (x) + (memq x (assoc (symbol-name + (car (or method gnus-select-method))) + gnus-valid-select-methods))) + '(mail post-mail)))) + (level (or (gnus-info-level info) gnus-level-killed)) + (score (or (gnus-info-score info) 0)) + (ticked (gnus-range-length (cdr (assq 'tick marked)))) + (group-age (gnus-group-timestamp-delta group))) + ;; FIXME: http://thread.gmane.org/gmane.emacs.gnus.general/65451/focus=65465 + ;; ====================================================================== + ;; From: Richard Stallman + ;; Subject: Re: Rewriting gnus-group-highlight-line (was: [...]) + ;; Cc: ding@gnus.org + ;; Date: Sat, 27 Oct 2007 19:41:20 -0400 + ;; Message-ID: + ;; + ;; [...] + ;; The kludge is that the alist elements contain expressions that refer + ;; to local variables with short names. Perhaps write your own tiny + ;; evaluator that handles just `and', `or', and numeric comparisons + ;; and just a few specific variables. + ;; ====================================================================== + ;; + ;; Similar for other evaluated variables. Grep for risky-local-variable + ;; to find them! -- rsteib + ;; + ;; Eval the cars of the lists until we find a match. + (while (and list + (not (eval (caar list)))) + (setq list (cdr list))) + list))) + +(defun gnus-group-highlight-line (group beg end) + "Highlight the current line according to `gnus-group-highlight'. +GROUP is current group, and the line to highlight starts at START +and ends at END." + (let ((face (cdar (gnus-group-update-eval-form + group + gnus-group-highlight)))) + (unless (eq face (get-text-property beg 'face)) + (let ((inhibit-read-only t)) + (gnus-put-text-property-excluding-characters-with-faces + beg end 'face + (if (boundp face) (symbol-value face) face))) + (gnus-extent-start-open beg)))) + +(defun gnus-group-get-icon (group) + "Return an icon for GROUP according to `gnus-group-icon-list'." + (if gnus-group-icon-list + (let ((image-path + (cdar (gnus-group-update-eval-form group gnus-group-icon-list)))) + (if image-path + (propertize " " + 'display + (append + (gnus-create-image (expand-file-name image-path)) + '(:ascent center))) + " ")) + " ")) (defun gnus-group-update-group (group &optional visible-only) "Update all lines where GROUP appear. === modified file 'lisp/gnus/gnus-html.el' --- lisp/gnus/gnus-html.el 2010-09-22 12:14:12 +0000 +++ lisp/gnus/gnus-html.el 2010-09-23 00:30:37 +0000 @@ -36,13 +36,20 @@ (require 'url) (require 'url-cache) (require 'xml) +(require 'browse-url) (defcustom gnus-html-image-cache-ttl (days-to-time 7) - "Time in seconds used to cache the image on disk." + "Time used to determine if we should use images from the cache." :version "24.1" :group 'gnus-art :type 'integer) +(defcustom gnus-html-image-automatic-caching t + "Whether automatically cache retrieve images." + :version "24.1" + :group 'gnus-art + :type 'boolean) + (defcustom gnus-html-frame-width 70 "What width to use when rendering HTML." :version "24.1" @@ -81,6 +88,10 @@ (define-key map [tab] 'widget-forward) map)) +(defun gnus-html-encode-url (url) + "Encode URL." + (browse-url-url-encode-chars url "[)$ ]")) + (defun gnus-html-cache-expired (url ttl) "Check if URL is cached for more than TTL." (cond (url-standalone-mode @@ -155,7 +166,7 @@ (delete-region (match-beginning 0) (match-end 0))) (setq end (point)) (when (string-match "src=\"\\([^\"]+\\)" parameters) - (setq url (match-string 1 parameters)) + (setq url (gnus-html-encode-url (match-string 1 parameters))) (gnus-message 8 "gnus-html-wash-tags: fetching image URL %s" url) (if (string-match "^cid:\\(.*\\)" url) ;; URLs with cid: have their content stashed in other @@ -177,6 +188,7 @@ (let ((alt-text (when (string-match "\\(alt\\|title\\)=\"\\([^\"]+\\)" parameters) (xml-substitute-special (match-string 2 parameters))))) + (gnus-put-text-property start end 'gnus-image-url url) (if (gnus-html-image-url-blocked-p url (if (buffer-live-p gnus-summary-buffer) @@ -191,13 +203,9 @@ :keymap gnus-html-image-map :button-keymap gnus-html-image-map) (let ((overlay (gnus-make-overlay start end)) - (spec (list url - (set-marker (make-marker) start) - (set-marker (make-marker) end) - alt-text))) + (spec (list url alt-text))) (gnus-overlay-put overlay 'local-map gnus-html-image-map) (gnus-overlay-put overlay 'gnus-image spec) - (gnus-put-text-property start end 'gnus-image-url url) (gnus-put-text-property start end 'gnus-image spec))) @@ -224,13 +232,9 @@ ;; asynchronously. (gnus-html-schedule-image-fetching (current-buffer) - (list url - (set-marker (make-marker) start) - (set-marker (make-marker) end) - alt-text)) + (list url alt-text)) ;; It's already cached, so just insert it. - (gnus-html-put-image (gnus-html-get-image-data url) - start end url alt-text))) + (gnus-html-put-image (gnus-html-get-image-data url) url alt-text))) (defun gnus-html-wash-tags () (let (tag parameters string start end images url) @@ -347,22 +351,17 @@ (list buffer image)))) (defun gnus-html-image-fetched (status buffer image) - (url-store-in-cache (current-buffer)) - (when (and (search-forward "\n\n" nil t) - (buffer-live-p buffer) - ;; If the `image' has no marker, do not replace anything - (cadr image) - ;; If the position of the marker is 1, then that - ;; means that the text it was in has been deleted; - ;; i.e., that the user has selected a different - ;; article before the image arrived. - (not (= (marker-position (cadr image)) - (with-current-buffer buffer - (point-min))))) - (let ((data (buffer-substring (point) (point-max)))) - (with-current-buffer buffer - (let ((inhibit-read-only t)) - (gnus-html-put-image data (cadr image) (caddr image) (car image) (cadddr image)))))) + "Callback function called when image has been fetched." + (unless (plist-get status :error) + (when gnus-html-image-automatic-caching + (url-store-in-cache (current-buffer))) + (when (and (or (search-forward "\n\n" nil t) + (search-forward "\r\n\r\n" nil t)) + (buffer-live-p buffer)) + (let ((data (buffer-substring (point) (point-max)))) + (with-current-buffer buffer + (let ((inhibit-read-only t)) + (gnus-html-put-image data (car image) (cadr image))))))) (kill-buffer (current-buffer))) (defun gnus-html-get-image-data (url) @@ -371,54 +370,61 @@ (with-temp-buffer (mm-disable-multibyte) (url-cache-extract (url-cache-create-filename url)) - (when (search-forward "\n\n" nil t) + (when (or (search-forward "\n\n" nil t) + (search-forward "\r\n\r\n" nil t)) (buffer-substring (point) (point-max))))) -(defun gnus-html-put-image (data start end &optional url alt-text) +(defun gnus-html-put-image (data url &optional alt-text) (when (gnus-graphic-display-p) - (let* ((image (ignore-errors - (gnus-create-image data nil t))) - (size (and image - (if (featurep 'xemacs) - (cons (glyph-width image) (glyph-height image)) - (image-size image t))))) - (save-excursion - (goto-char start) - (let ((alt-text (or alt-text (buffer-substring-no-properties start end)))) - (if (and image - ;; Kludge to avoid displaying 30x30 gif images, which - ;; seems to be a signal of a broken image. - (not (and (if (featurep 'xemacs) - (glyphp image) - (listp image)) - (eq (if (featurep 'xemacs) - (let ((d (cdadar (specifier-spec-list - (glyph-image image))))) - (and (vectorp d) - (aref d 0))) - (plist-get (cdr image) :type)) - 'gif) - (= (car size) 30) - (= (cdr size) 30)))) - ;; Good image, add it! - (let ((image (gnus-html-rescale-image image data size))) - (delete-region start end) - (gnus-put-image image alt-text 'external) - (gnus-put-text-property start (point) 'help-echo alt-text) - (gnus-overlay-put (gnus-make-overlay start (point)) 'local-map - gnus-html-displayed-image-map) - (gnus-put-text-property start (point) 'gnus-alt-text alt-text) - (when url - (gnus-put-text-property start (point) 'gnus-image-url url)) - (gnus-add-image 'external image) - t) - ;; Bad image, try to show something else - (delete-region start end) - (when (fboundp 'find-image) - (setq image (find-image '((:type xpm :file "lock-broken.xpm")))) - (gnus-put-image image alt-text 'internal) - (gnus-add-image 'internal image)) - nil)))))) + (let* ((start (text-property-any (point-min) (point-max) 'gnus-image-url url)) + (end (when start + (next-single-property-change start 'gnus-image-url)))) + ;; Image found? + (when start + (let* ((image + (ignore-errors + (gnus-create-image data nil t))) + (size (and image + (if (featurep 'xemacs) + (cons (glyph-width image) (glyph-height image)) + (image-size image t))))) + (save-excursion + (goto-char start) + (let ((alt-text (or alt-text (buffer-substring-no-properties start end)))) + (if (and image + ;; Kludge to avoid displaying 30x30 gif images, which + ;; seems to be a signal of a broken image. + (not (and (if (featurep 'xemacs) + (glyphp image) + (listp image)) + (eq (if (featurep 'xemacs) + (let ((d (cdadar (specifier-spec-list + (glyph-image image))))) + (and (vectorp d) + (aref d 0))) + (plist-get (cdr image) :type)) + 'gif) + (= (car size) 30) + (= (cdr size) 30)))) + ;; Good image, add it! + (let ((image (gnus-html-rescale-image image data size))) + (delete-region start end) + (gnus-put-image image alt-text 'external) + (gnus-put-text-property start (point) 'help-echo alt-text) + (gnus-overlay-put (gnus-make-overlay start (point)) 'local-map + gnus-html-displayed-image-map) + (gnus-put-text-property start (point) 'gnus-alt-text alt-text) + (when url + (gnus-put-text-property start (point) 'gnus-image-url url)) + (gnus-add-image 'external image) + t) + ;; Bad image, try to show something else + (when (fboundp 'find-image) + (delete-region start end) + (setq image (find-image '((:type xpm :file "lock-broken.xpm")))) + (gnus-put-image image alt-text 'internal) + (gnus-add-image 'internal image)) + nil)))))))) (defun gnus-html-rescale-image (image data size) (if (or (not (fboundp 'imagemagick-types)) @@ -426,7 +432,7 @@ image (let* ((width (car size)) (height (cdr size)) - (edges (window-pixel-edges (get-buffer-window (current-buffer)))) + (edges (window-inside-pixel-edges (get-buffer-window (current-buffer)))) (window-width (truncate (* gnus-max-image-proportion (- (nth 2 edges) (nth 0 edges))))) (window-height (truncate (* gnus-max-image-proportion @@ -472,7 +478,7 @@ gnus-blocked-images))) (save-match-data (while (re-search-forward " start-article 1) @@ -815,8 +822,10 @@ (push (cons 'active (gnus-active group)) marks))) (dolist (type (cdr nnimap-mark-alist)) (let ((old-marks (assoc (car type) marks)) - (new-marks (gnus-compress-sequence - (cdr (assoc (cadr type) flags))))) + (new-marks + (gnus-compress-sequence + (cdr (or (assoc (caddr type) flags) ; %Flagged + (assoc (cadr type) flags)))))) ; "\Flagged" (setq marks (delq old-marks marks)) (pop old-marks) (when (and old-marks @@ -838,12 +847,13 @@ (push (list group info active) nnimap-current-infos)))) (defun nnimap-flags-to-marks (groups) - (let (data group totalp uidnext articles start-article mark) + (let (data group totalp uidnext articles start-article mark permanent-flags) (dolist (elem groups) (setq group (car elem) - uidnext (cadr elem) - start-article (caddr elem) - articles (cdddr elem)) + uidnext (nth 1 elem) + start-article (nth 2 elem) + permanent-flags (nth 3 elem) + articles (nthcdr 4 elem)) (let ((high (caar articles)) marks low existing) (dolist (article articles) @@ -853,36 +863,49 @@ (setq mark (assoc flag marks)) (if (not mark) (push (list flag (car article)) marks) - (setcdr mark (cons (car article) (cdr mark))))) - (push (list group existing marks high low uidnext start-article) - data)))) + (setcdr mark (cons (car article) (cdr mark)))))) + (push (list group existing marks high low uidnext start-article + permanent-flags) + data))) data)) (defun nnimap-parse-flags (sequences) (goto-char (point-min)) - (let (start end articles groups uidnext elems) + ;; Change \Delete etc to %Delete, so that the reader can read it. + (subst-char-in-region (point-min) (point-max) + ?\\ ?% t) + (let (start end articles groups uidnext elems permanent-flags) (dolist (elem sequences) (destructuring-bind (group-sequence flag-sequence totalp group) elem + (setq start (point)) ;; The EXAMINE was successful. (when (and (search-forward (format "\n%d OK " group-sequence) nil t) (progn (forward-line 1) - (setq start (point)) - (if (re-search-backward "UIDNEXT \\([0-9]+\\)" - (or end (point-min)) t) - (setq uidnext (string-to-number (match-string 1))) - (setq uidnext nil)) - (goto-char start)) + (setq end (point)) + (goto-char start) + (setq permanent-flags + (and (search-forward "PERMANENTFLAGS " + (or end (point-min)) t) + (read (current-buffer)))) + (goto-char start) + (setq uidnext + (and (search-forward "UIDNEXT " + (or end (point-min)) t) + (read (current-buffer)))) + (goto-char end) + (forward-line -1)) ;; The UID FETCH FLAGS was successful. (search-forward (format "\n%d OK " flag-sequence) nil t)) - (setq end (point)) - (goto-char start) - (while (re-search-forward "^\\* [0-9]+ FETCH (\\(.*\\))" end t) - (setq elems (nnimap-parse-line (match-string 1))) - (push (cons (string-to-number (cadr (member "UID" elems))) - (cadr (member "FLAGS" elems))) + (setq start (point)) + (goto-char end) + (while (search-forward " FETCH " start t) + (setq elems (read (current-buffer))) + (push (cons (cadr (memq 'UID elems)) + (cadr (memq 'FLAGS elems))) articles)) - (push (nconc (list group uidnext totalp) articles) groups) + (push (nconc (list group uidnext totalp permanent-flags) articles) + groups) (setq articles nil)))) groups)) @@ -1085,32 +1108,38 @@ (nnmail-split-incoming (current-buffer) #'nnimap-save-mail-spec nil nil - #'nnimap-dummy-active-number) + #'nnimap-dummy-active-number + #'nnimap-save-mail-spec) (when nnimap-incoming-split-list (let ((specs (nnimap-make-split-specs nnimap-incoming-split-list)) - sequences) + sequences junk-articles) ;; Create any groups that doesn't already exist on the ;; server first. (dolist (spec specs) - (unless (member (car spec) groups) + (when (and (not (member (car spec) groups)) + (not (eq (car spec) 'junk))) (nnimap-command "CREATE %S" (utf7-encode (car spec) t)))) ;; Then copy over all the messages. (erase-buffer) (dolist (spec specs) (let ((group (car spec)) (ranges (cdr spec))) - (push (list (nnimap-send-command "UID COPY %s %S" - (nnimap-article-ranges ranges) - (utf7-encode group t)) - ranges) - sequences))) + (if (eq group 'junk) + (setq junk-articles ranges) + (push (list (nnimap-send-command + "UID COPY %s %S" + (nnimap-article-ranges ranges) + (utf7-encode group t)) + ranges) + sequences)))) ;; Wait for the last COPY response... (when sequences (nnimap-wait-for-response (caar sequences)) ;; And then mark the successful copy actions as deleted, ;; and possibly expunge them. (nnimap-mark-and-expunge-incoming - (nnimap-parse-copied-articles sequences))))))))) + (nnimap-parse-copied-articles sequences)) + (nnimap-mark-and-expunge-incoming junk-articles)))))))) (defun nnimap-mark-and-expunge-incoming (range) (when range @@ -1125,7 +1154,7 @@ (setq sequence (nnimap-send-command "UID EXPUNGE %s" range))) ;; If it doesn't support UID EXPUNGE, then we only expunge if the ;; user has configured it. - (nnimap-expunge-inbox + (nnimap-expunge (setq sequence (nnimap-send-command "EXPUNGE")))) (nnimap-wait-for-response sequence)))) @@ -1142,8 +1171,8 @@ (let (new) (dolist (elem flags) (when (or (null (cdr elem)) - (and (not (member "\\Deleted" (cdr elem))) - (not (member "\\Seen" (cdr elem))))) + (and (not (memq '%Deleted (cdr elem))) + (not (memq '%Seen (cdr elem))))) (push (car elem) new))) (gnus-compress-sequence (nreverse new)))) @@ -1190,7 +1219,10 @@ (if (not (re-search-forward "X-nnimap-article: \\([0-9]+\\)" nil t)) (error "Invalid nnimap mail") (setq article (string-to-number (match-string 1)))) - (push (list article group-art) + (push (list article + (if (eq group-art 'junk) + (list (cons 'junk 1)) + group-art)) nnimap-incoming-split-list))) (provide 'nnimap) === modified file 'lisp/gnus/nnmail.el' --- lisp/gnus/nnmail.el 2010-09-21 23:13:46 +0000 +++ lisp/gnus/nnmail.el 2010-09-23 00:30:37 +0000 @@ -963,7 +963,7 @@ (goto-char end))) count)) -(defun nnmail-process-mmdf-mail-format (func artnum-func) +(defun nnmail-process-mmdf-mail-format (func artnum-func &optional junk-func) (let ((delim "^\^A\^A\^A\^A$") (case-fold-search t) (count 0) @@ -1011,7 +1011,7 @@ (narrow-to-region start (point)) (goto-char (point-min)) (incf count) - (nnmail-check-duplication message-id func artnum-func) + (nnmail-check-duplication message-id func artnum-func junk-func) (setq end (point-max)))) (goto-char end) (forward-line 2))) @@ -1056,7 +1056,7 @@ "Non-nil means group names are not encoded.") (defun nnmail-split-incoming (incoming func &optional exit-func - group artnum-func) + group artnum-func junk-func) "Go through the entire INCOMING file and pick out each individual mail. FUNC will be called with the buffer narrowed to each mail. INCOMING can also be a buffer object. In that case, the mail @@ -1087,7 +1087,8 @@ (looking-at "BABYL OPTIONS:")) (nnmail-process-babyl-mail-format func artnum-func)) ((looking-at "\^A\^A\^A\^A") - (nnmail-process-mmdf-mail-format func artnum-func)) + (nnmail-process-mmdf-mail-format + func artnum-func junk-func)) ((looking-at "Return-Path:") (nnmail-process-maildir-mail-format func artnum-func)) (t @@ -1096,7 +1097,7 @@ (funcall exit-func)) (kill-buffer (current-buffer)))))) -(defun nnmail-article-group (func &optional trace) +(defun nnmail-article-group (func &optional trace junk-func) "Look at the headers and return an alist of groups that match. FUNC will be called with the group name to determine the article number." (let ((methods (or nnmail-split-methods '(("bogus" "")))) @@ -1163,9 +1164,10 @@ ;; The article may be "cross-posted" to `junk'. What ;; to do? Just remove the `junk' spec. Don't really ;; see anything else to do... - (let (elem) - (while (setq elem (car (memq 'junk split))) - (setq split (delq elem split)))) + (when (and (memq 'junk split) + junk-func) + (funcall junk-func 'junk)) + (setq split (delq 'junk split)) (when split (setq group-art (mapcar @@ -1714,7 +1716,8 @@ (message-narrow-to-head) (message-fetch-field header)))) -(defun nnmail-check-duplication (message-id func artnum-func) +(defun nnmail-check-duplication (message-id func artnum-func + &optional junk-func) (run-hooks 'nnmail-prepare-incoming-message-hook) ;; If this is a duplicate message, then we do not save it. (let* ((duplication (nnmail-cache-id-exists-p message-id)) @@ -1739,7 +1742,8 @@ (cond ((not duplication) (funcall func (setq group-art - (nreverse (nnmail-article-group artnum-func)))) + (nreverse (nnmail-article-group + artnum-func nil junk-func)))) (nnmail-cache-insert message-id (caar group-art))) ((eq action 'delete) (setq group-art nil)) ------------------------------------------------------------ revno: 101544 committer: Juanma Barranquero branch nick: trunk timestamp: Thu 2010-09-23 01:14:00 +0200 message: Fix bug#6820: Don't accept backslashes or quotes on compiler options. * nt/configure.bat: Err out when the argument of --cflags contains invalid characters (check implemented only for GCC). diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2010-08-19 16:38:41 +0000 +++ nt/ChangeLog 2010-09-22 23:14:00 +0000 @@ -1,3 +1,8 @@ +2010-09-22 Juanma Barranquero + + * configure.bat: Err out when the argument of --cflags contains + invalid characters (check implemented only for GCC). (Bug#6820) + 2010-08-19 Juanma Barranquero * addpm.c (add_registry): Create App Paths of type REG_EXPAND_SZ. === modified file 'nt/configure.bat' --- nt/configure.bat 2010-09-22 17:26:02 +0000 +++ nt/configure.bat 2010-09-22 23:14:00 +0000 @@ -358,9 +358,25 @@ @echo gcc %cf% -c junk.c >>config.log gcc %cf% -c junk.c >>config.log 2>&1 set cf= +if exist junk.o goto chkuser +echo The failed program was: >>config.log +type junk.c >>config.log +goto nocompiler + +:chkuser +rm -f junk.o +echo int main (int argc, char *argv[]) {>junk.c +echo char *usercflags = "%usercflags%";>>junk.c +echo }>>junk.c +echo gcc -Werror -c junk.c >>config.log +gcc -Werror -c junk.c >>config.log 2>&1 if exist junk.o goto gccOk -echo The failed program was: >>config.log -type junk.c >>config.log +echo. +echo Error in --cflags argument: %usercflags% +echo Backslashes and quotes cannot be used with --cflags. Please use forward +echo slashes for filenames and paths (e.g. when passing directories to -I). +rm -f junk.c +goto end :nocompiler echo. ------------------------------------------------------------ revno: 101543 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2010-09-22 15:22:06 -0400 message: Fix some more uses of int instead of EMACS_INT. editfns.c (Fsubst_char_in_region, Ftranslate_region_internal) (check_translation): Use EMACS_INT for buffer positions and length. undo.c (record_marker_adjustment, record_delete) (record_change, record_point, record_insert) (record_property_change, Fprimitive_undo): Use EMACS_INT for buffer positions. lisp.h (record_marker_adjustment, record_delete) (record_change, record_point, record_insert) (record_property_change, Fprimitive_undo): Adjust prototypes. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-09-22 17:31:21 +0000 +++ src/ChangeLog 2010-09-22 19:22:06 +0000 @@ -1,3 +1,18 @@ +2010-09-22 Eli Zaretskii + + * editfns.c (Fsubst_char_in_region, Ftranslate_region_internal) + (check_translation): Use EMACS_INT for buffer positions and + length. + + * undo.c (record_marker_adjustment, record_delete) + (record_change, record_point, record_insert) + (record_property_change, Fprimitive_undo): Use EMACS_INT for + buffer positions. + + * lisp.h (record_marker_adjustment, record_delete) + (record_change, record_point, record_insert) + (record_property_change, Fprimitive_undo): Adjust prototypes. + 2010-09-22 Juanma Barranquero Eli Zaretskii === modified file 'src/editfns.c' --- src/editfns.c 2010-09-22 16:03:34 +0000 +++ src/editfns.c 2010-09-22 19:22:06 +0000 @@ -2705,7 +2705,7 @@ Both characters must have the same length of multi-byte form. */) (Lisp_Object start, Lisp_Object end, Lisp_Object fromchar, Lisp_Object tochar, Lisp_Object noundo) { - register int pos, pos_byte, stop, i, len, end_byte; + register EMACS_INT pos, pos_byte, stop, i, len, end_byte; /* Keep track of the first change in the buffer: if 0 we haven't found it yet. if < 0 we've found it and we've run the before-change-function. @@ -2776,7 +2776,7 @@ stop = min (stop, GPT_BYTE); while (1) { - int pos_byte_next = pos_byte; + EMACS_INT pos_byte_next = pos_byte; if (pos_byte >= stop) { @@ -2879,7 +2879,8 @@ } -static Lisp_Object check_translation (int, int, int, Lisp_Object); +static Lisp_Object check_translation (EMACS_INT, EMACS_INT, EMACS_INT, + Lisp_Object); /* Helper function for Ftranslate_region_internal. @@ -2888,7 +2889,8 @@ element is found, return it. Otherwise return Qnil. */ static Lisp_Object -check_translation (int pos, int pos_byte, int end, Lisp_Object val) +check_translation (EMACS_INT pos, EMACS_INT pos_byte, EMACS_INT end, + Lisp_Object val) { int buf_size = 16, buf_used = 0; int *buf = alloca (sizeof (int) * buf_size); @@ -2896,7 +2898,7 @@ for (; CONSP (val); val = XCDR (val)) { Lisp_Object elt; - int len, i; + EMACS_INT len, i; elt = XCAR (val); if (! CONSP (elt)) @@ -2912,7 +2914,7 @@ if (buf_used <= i) { unsigned char *p = BYTE_POS_ADDR (pos_byte); - int len; + int len1; if (buf_used == buf_size) { @@ -2923,8 +2925,8 @@ memcpy (newbuf, buf, sizeof (int) * buf_used); buf = newbuf; } - buf[buf_used++] = STRING_CHAR_AND_LENGTH (p, len); - pos_byte += len; + buf[buf_used++] = STRING_CHAR_AND_LENGTH (p, len1); + pos_byte += len1; } if (XINT (AREF (elt, i)) != buf[i]) break; @@ -2950,7 +2952,7 @@ register int nc; /* New character. */ int cnt; /* Number of changes made. */ int size; /* Size of translate table. */ - int pos, pos_byte, end_pos; + EMACS_INT pos, pos_byte, end_pos; int multibyte = !NILP (current_buffer->enable_multibyte_characters); int string_multibyte; Lisp_Object val; === modified file 'src/lisp.h' --- src/lisp.h 2010-09-22 16:03:34 +0000 +++ src/lisp.h 2010-09-22 19:22:06 +0000 @@ -3393,12 +3393,13 @@ extern Lisp_Object Qinhibit_read_only; EXFUN (Fundo_boundary, 0); extern void truncate_undo_list (struct buffer *); -extern void record_marker_adjustment (Lisp_Object, int); -extern void record_insert (int, int); -extern void record_delete (int, Lisp_Object); +extern void record_marker_adjustment (Lisp_Object, EMACS_INT); +extern void record_insert (EMACS_INT, EMACS_INT); +extern void record_delete (EMACS_INT, Lisp_Object); extern void record_first_change (void); -extern void record_change (int, int); -extern void record_property_change (int, int, Lisp_Object, Lisp_Object, +extern void record_change (EMACS_INT, EMACS_INT); +extern void record_property_change (EMACS_INT, EMACS_INT, + Lisp_Object, Lisp_Object, Lisp_Object); extern void syms_of_undo (void); extern Lisp_Object Vundo_outer_limit; === modified file 'src/undo.c' --- src/undo.c 2010-07-08 21:25:08 +0000 +++ src/undo.c 2010-09-22 19:22:06 +0000 @@ -67,7 +67,7 @@ undo record that will be added just after this command terminates. */ static void -record_point (int pt) +record_point (EMACS_INT pt) { int at_boundary; @@ -129,7 +129,7 @@ because we don't need to record the contents.) */ void -record_insert (int beg, int length) +record_insert (EMACS_INT beg, EMACS_INT length) { Lisp_Object lbeg, lend; @@ -164,7 +164,7 @@ of the characters in STRING, at location BEG. */ void -record_delete (int beg, Lisp_Object string) +record_delete (EMACS_INT beg, Lisp_Object string) { Lisp_Object sbeg; @@ -192,7 +192,7 @@ won't be inverted automatically by undoing the buffer modification. */ void -record_marker_adjustment (Lisp_Object marker, int adjustment) +record_marker_adjustment (Lisp_Object marker, EMACS_INT adjustment) { if (EQ (current_buffer->undo_list, Qt)) return; @@ -215,7 +215,7 @@ The replacement must not change the number of characters. */ void -record_change (int beg, int length) +record_change (EMACS_INT beg, EMACS_INT length) { record_delete (beg, make_buffer_string (beg, beg + length, 1)); record_insert (beg, length); @@ -250,7 +250,9 @@ for LENGTH characters starting at position BEG in BUFFER. */ void -record_property_change (int beg, int length, Lisp_Object prop, Lisp_Object value, Lisp_Object buffer) +record_property_change (EMACS_INT beg, EMACS_INT length, + Lisp_Object prop, Lisp_Object value, + Lisp_Object buffer) { Lisp_Object lbeg, lend, entry; struct buffer *obuf = current_buffer, *buf = XBUFFER (buffer); @@ -601,7 +603,7 @@ { /* Element (STRING . POS) means STRING was deleted. */ Lisp_Object membuf; - int pos = XINT (cdr); + EMACS_INT pos = XINT (cdr); membuf = car; if (pos < 0) ------------------------------------------------------------ revno: 101542 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2010-09-22 20:39:51 +0200 message: w32.c (get_emacs_configuration_options): Fix last change. diff: === modified file 'src/w32.c' --- src/w32.c 2010-09-22 17:31:21 +0000 +++ src/w32.c 2010-09-22 18:39:51 +0000 @@ -1963,6 +1963,7 @@ size += strlen (options[i]); options_buffer = xmalloc (size + 1); + options_buffer[0] = '\0'; for (i = 0; options[i]; i++) strcat (options_buffer, options[i]); ------------------------------------------------------------ revno: 101541 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2010-09-22 19:31:21 +0200 message: src/w32.c (get_emacs_configuration_options): Fix buffer overrun. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-09-22 16:03:34 +0000 +++ src/ChangeLog 2010-09-22 17:31:21 +0000 @@ -1,3 +1,8 @@ +2010-09-22 Juanma Barranquero + Eli Zaretskii + + * w32.c (get_emacs_configuration_options): Fix buffer overrun. + 2010-09-22 Eli Zaretskii * minibuf.c (Fminibuffer_contents) === modified file 'src/w32.c' --- src/w32.c 2010-09-20 00:18:18 +0000 +++ src/w32.c 2010-09-22 17:31:21 +0000 @@ -1925,7 +1925,25 @@ char * get_emacs_configuration_options (void) { - static char options_buffer[256]; + static char *options_buffer; + char cv[32]; /* Enough for COMPILER_VERSION. */ + char *options[] = { + cv, /* To be filled later. */ +#ifdef EMACSDEBUG + " --no-opt", +#endif + /* configure.bat already sets USER_CFLAGS and USER_LDFLAGS + with a starting space to save work here. */ +#ifdef USER_CFLAGS + " --cflags", USER_CFLAGS, +#endif +#ifdef USER_LDFLAGS + " --ldflags", USER_LDFLAGS, +#endif + NULL + }; + size_t size = 0; + int i; /* Work out the effective configure options for this build. */ #ifdef _MSC_VER @@ -1938,18 +1956,17 @@ #endif #endif - sprintf (options_buffer, COMPILER_VERSION); -#ifdef EMACSDEBUG - strcat (options_buffer, " --no-opt"); -#endif -#ifdef USER_CFLAGS - strcat (options_buffer, " --cflags"); - strcat (options_buffer, USER_CFLAGS); -#endif -#ifdef USER_LDFLAGS - strcat (options_buffer, " --ldflags"); - strcat (options_buffer, USER_LDFLAGS); -#endif + if (_snprintf (cv, sizeof (cv), COMPILER_VERSION) < 0) + return "Error: not enough space for compiler version"; + + for (i = 0; options[i]; i++) + size += strlen (options[i]); + + options_buffer = xmalloc (size + 1); + + for (i = 0; options[i]; i++) + strcat (options_buffer, options[i]); + return options_buffer; } ------------------------------------------------------------ revno: 101540 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2010-09-22 19:26:02 +0200 message: nt/configure.bat: Add comment about USER_(C|LD)FLAGS. diff: === modified file 'nt/configure.bat' --- nt/configure.bat 2010-09-22 01:30:05 +0000 +++ nt/configure.bat 2010-09-22 17:26:02 +0000 @@ -630,6 +630,8 @@ copy config.nt config.tmp echo. >>config.tmp echo /* Start of settings from configure.bat. */ >>config.tmp +rem We write USER_CFLAGS and USER_LDFLAGS starting with a space to simplify +rem processing of compiler options in w32.c:get_emacs_configuration_options if (%docflags%) == (Y) echo #define USER_CFLAGS " %usercflags%">>config.tmp if (%doldflags%) == (Y) echo #define USER_LDFLAGS " %userldflags%">>config.tmp if (%profile%) == (Y) echo #define PROFILING 1 >>config.tmp ------------------------------------------------------------ revno: 101539 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2010-09-22 12:03:34 -0400 message: Fix some uses of int instead of EMACS_INT. minibuf.c (Fminibuffer_contents) (Fminibuffer_contents_no_properties) (Fminibuffer_completion_contents): Use EMACS_INT for minibuffer positions. keyboard.c (command_loop_1): Use EMACS_INT to compare point with mark. alloc.c (make_uninit_string, make_uninit_multibyte_string) (allocate_string_data): Accept EMACS_INT for string length. editfns.c (Ffield_string, Ffield_string_no_properties) (make_buffer_string, make_buffer_string_both, Fbuffer_substring) (Fbuffer_substring_no_properties, find_field, Fdelete_field) (Ffield_string, Ffield_string_no_properties, Ffield_beginning) (Ffield_end): Use EMACS_INT for buffer positions. insdel.c (prepare_to_modify_buffer): Use EMACS_INT to compare point with mark. lisp.h (allocate_string_data, make_uninit_string) (make_uninit_multibyte_string, make_buffer_string) (make_buffer_string_both): Adjust prototypes. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-09-22 03:10:16 +0000 +++ src/ChangeLog 2010-09-22 16:03:34 +0000 @@ -1,3 +1,29 @@ +2010-09-22 Eli Zaretskii + + * minibuf.c (Fminibuffer_contents) + (Fminibuffer_contents_no_properties) + (Fminibuffer_completion_contents): Use EMACS_INT for minibuffer + positions. + + * keyboard.c (command_loop_1): Use EMACS_INT to compare point with + mark. + + * alloc.c (make_uninit_string, make_uninit_multibyte_string) + (allocate_string_data): Accept EMACS_INT for string length. + + * editfns.c (Ffield_string, Ffield_string_no_properties) + (make_buffer_string, make_buffer_string_both, Fbuffer_substring) + (Fbuffer_substring_no_properties, find_field, Fdelete_field) + (Ffield_string, Ffield_string_no_properties, Ffield_beginning) + (Ffield_end): Use EMACS_INT for buffer positions. + + * insdel.c (prepare_to_modify_buffer): Use EMACS_INT to compare + point with mark. + + * lisp.h (allocate_string_data, make_uninit_string) + (make_uninit_multibyte_string, make_buffer_string) + (make_buffer_string_both): Adjust prototypes. + 2010-09-22 Chong Yidong * xml.c: Switch to GNU indentation. === modified file 'src/alloc.c' --- src/alloc.c 2010-08-20 23:02:11 +0000 +++ src/alloc.c 2010-09-22 16:03:34 +0000 @@ -1908,7 +1908,8 @@ S->data if it was initially non-null. */ void -allocate_string_data (struct Lisp_String *s, int nchars, int nbytes) +allocate_string_data (struct Lisp_String *s, + EMACS_INT nchars, EMACS_INT nbytes) { struct sdata *data, *old_data; struct sblock *b; @@ -2412,7 +2413,7 @@ occupying LENGTH bytes. */ Lisp_Object -make_uninit_string (int length) +make_uninit_string (EMACS_INT length) { Lisp_Object val; @@ -2428,7 +2429,7 @@ which occupy NBYTES bytes. */ Lisp_Object -make_uninit_multibyte_string (int nchars, int nbytes) +make_uninit_multibyte_string (EMACS_INT nchars, EMACS_INT nbytes) { Lisp_Object string; struct Lisp_String *s; === modified file 'src/editfns.c' --- src/editfns.c 2010-09-14 20:32:35 +0000 +++ src/editfns.c 2010-09-22 16:03:34 +0000 @@ -94,7 +94,8 @@ #endif static int tm_diff (struct tm *, struct tm *); -static void find_field (Lisp_Object, Lisp_Object, Lisp_Object, int *, Lisp_Object, int *); +static void find_field (Lisp_Object, Lisp_Object, Lisp_Object, + EMACS_INT *, Lisp_Object, EMACS_INT *); static void update_buffer_properties (int, int); static Lisp_Object region_limit (int); static size_t emacs_memftimeu (char *, size_t, const char *, @@ -515,7 +516,9 @@ is not stored. */ static void -find_field (Lisp_Object pos, Lisp_Object merge_at_boundary, Lisp_Object beg_limit, int *beg, Lisp_Object end_limit, int *end) +find_field (Lisp_Object pos, Lisp_Object merge_at_boundary, + Lisp_Object beg_limit, + EMACS_INT *beg, Lisp_Object end_limit, EMACS_INT *end) { /* Fields right before and after the point. */ Lisp_Object before_field, after_field; @@ -631,7 +634,7 @@ If POS is nil, the value of point is used for POS. */) (Lisp_Object pos) { - int beg, end; + EMACS_INT beg, end; find_field (pos, Qnil, Qnil, &beg, Qnil, &end); if (beg != end) del_range (beg, end); @@ -644,7 +647,7 @@ If POS is nil, the value of point is used for POS. */) (Lisp_Object pos) { - int beg, end; + EMACS_INT beg, end; find_field (pos, Qnil, Qnil, &beg, Qnil, &end); return make_buffer_string (beg, end, 1); } @@ -655,7 +658,7 @@ If POS is nil, the value of point is used for POS. */) (Lisp_Object pos) { - int beg, end; + EMACS_INT beg, end; find_field (pos, Qnil, Qnil, &beg, Qnil, &end); return make_buffer_string (beg, end, 0); } @@ -670,7 +673,7 @@ is before LIMIT, then LIMIT will be returned instead. */) (Lisp_Object pos, Lisp_Object escape_from_edge, Lisp_Object limit) { - int beg; + EMACS_INT beg; find_field (pos, escape_from_edge, limit, &beg, Qnil, 0); return make_number (beg); } @@ -685,7 +688,7 @@ is after LIMIT, then LIMIT will be returned instead. */) (Lisp_Object pos, Lisp_Object escape_from_edge, Lisp_Object limit) { - int end; + EMACS_INT end; find_field (pos, escape_from_edge, Qnil, 0, limit, &end); return make_number (end); } @@ -2343,10 +2346,10 @@ buffer substrings. */ Lisp_Object -make_buffer_string (int start, int end, int props) +make_buffer_string (EMACS_INT start, EMACS_INT end, int props) { - int start_byte = CHAR_TO_BYTE (start); - int end_byte = CHAR_TO_BYTE (end); + EMACS_INT start_byte = CHAR_TO_BYTE (start); + EMACS_INT end_byte = CHAR_TO_BYTE (end); return make_buffer_string_both (start, start_byte, end, end_byte, props); } @@ -2367,7 +2370,8 @@ buffer substrings. */ Lisp_Object -make_buffer_string_both (int start, int start_byte, int end, int end_byte, int props) +make_buffer_string_both (EMACS_INT start, EMACS_INT start_byte, + EMACS_INT end, EMACS_INT end_byte, int props) { Lisp_Object result, tem, tem1; @@ -2439,7 +2443,7 @@ use `buffer-substring-no-properties' instead. */) (Lisp_Object start, Lisp_Object end) { - register int b, e; + register EMACS_INT b, e; validate_region (&start, &end); b = XINT (start); @@ -2455,7 +2459,7 @@ they can be in either order. */) (Lisp_Object start, Lisp_Object end) { - register int b, e; + register EMACS_INT b, e; validate_region (&start, &end); b = XINT (start); === modified file 'src/insdel.c' --- src/insdel.c 2010-08-16 02:33:17 +0000 +++ src/insdel.c 2010-09-22 16:03:34 +0000 @@ -2057,8 +2057,8 @@ : (!NILP (Vselect_active_regions) && !NILP (Vtransient_mark_mode)))) { - int b = XINT (Fmarker_position (current_buffer->mark)); - int e = XINT (make_number (PT)); + EMACS_INT b = XINT (Fmarker_position (current_buffer->mark)); + EMACS_INT e = PT; if (b < e) Vsaved_region_selection = make_buffer_string (b, e, 0); else if (b > e) === modified file 'src/keyboard.c' --- src/keyboard.c 2010-09-17 09:54:28 +0000 +++ src/keyboard.c 2010-09-22 16:03:34 +0000 @@ -1811,8 +1811,9 @@ && !NILP (Vtransient_mark_mode))) && !EQ (Vthis_command, Qhandle_switch_frame)) { - int beg = XINT (Fmarker_position (current_buffer->mark)); - int end = XINT (make_number (PT)); + EMACS_INT beg = + XINT (Fmarker_position (current_buffer->mark)); + EMACS_INT end = PT; if (beg < end) call2 (Qx_set_selection, QPRIMARY, make_buffer_string (beg, end, 0)); === modified file 'src/lisp.h' --- src/lisp.h 2010-09-12 14:35:37 +0000 +++ src/lisp.h 2010-09-22 16:03:34 +0000 @@ -2692,7 +2692,7 @@ /* Defined in alloc.c */ extern void check_pure_size (void); -extern void allocate_string_data (struct Lisp_String *, int, int); +extern void allocate_string_data (struct Lisp_String *, EMACS_INT, EMACS_INT); extern void reset_malloc_hooks (void); extern void uninterrupt_malloc (void); extern void malloc_warning (const char *); @@ -2722,8 +2722,8 @@ extern Lisp_Object make_unibyte_string (const char *, int); extern Lisp_Object make_multibyte_string (const char *, int, int); extern Lisp_Object make_event_array (int, Lisp_Object *); -extern Lisp_Object make_uninit_string (int); -extern Lisp_Object make_uninit_multibyte_string (int, int); +extern Lisp_Object make_uninit_string (EMACS_INT); +extern Lisp_Object make_uninit_multibyte_string (EMACS_INT, EMACS_INT); extern Lisp_Object make_string_from_bytes (const char *, int, int); extern Lisp_Object make_specified_string (const char *, int, int, int); EXFUN (Fpurecopy, 1); @@ -2991,8 +2991,9 @@ EXFUN (Fsystem_name, 0); EXFUN (Fcurrent_time, 0); extern int clip_to_bounds (int, int, int); -extern Lisp_Object make_buffer_string (int, int, int); -extern Lisp_Object make_buffer_string_both (int, int, int, int, int); +extern Lisp_Object make_buffer_string (EMACS_INT, EMACS_INT, int); +extern Lisp_Object make_buffer_string_both (EMACS_INT, EMACS_INT, EMACS_INT, + EMACS_INT, int); extern void init_editfns (void); extern void syms_of_editfns (void); EXFUN (Fconstrain_to_field, 5); === modified file 'src/minibuf.c' --- src/minibuf.c 2010-08-08 21:12:29 +0000 +++ src/minibuf.c 2010-09-22 16:03:34 +0000 @@ -370,7 +370,7 @@ If the current buffer is not a minibuffer, return its entire contents. */) (void) { - int prompt_end = XINT (Fminibuffer_prompt_end ()); + EMACS_INT prompt_end = XINT (Fminibuffer_prompt_end ()); return make_buffer_string (prompt_end, ZV, 1); } @@ -380,7 +380,7 @@ If the current buffer is not a minibuffer, return its entire contents. */) (void) { - int prompt_end = XINT (Fminibuffer_prompt_end ()); + EMACS_INT prompt_end = XINT (Fminibuffer_prompt_end ()); return make_buffer_string (prompt_end, ZV, 0); } @@ -391,7 +391,7 @@ If the current buffer is not a minibuffer, return its entire contents. */) (void) { - int prompt_end = XINT (Fminibuffer_prompt_end ()); + EMACS_INT prompt_end = XINT (Fminibuffer_prompt_end ()); if (PT < prompt_end) error ("Cannot do completion in the prompt"); return make_buffer_string (prompt_end, PT, 1); ------------------------------------------------------------ revno: 101538 author: Teodor Zlatanov committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2010-09-22 13:34:37 +0000 message: nnimap.el (nnimap-delete-article): Tell user if expunge won't happen. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-09-22 12:49:48 +0000 +++ lisp/gnus/ChangeLog 2010-09-22 13:34:37 +0000 @@ -1,3 +1,7 @@ +2010-09-22 Teodor Zlatanov + + * nnimap.el (nnimap-delete-article): Tell user if expunge won't happen. + 2010-09-22 Julien Danjou * gnus-group.el (gnus-group-update-hook): Call gnus-group-add-icon by === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2010-09-21 23:13:46 +0000 +++ lisp/gnus/nnimap.el 2010-09-22 13:34:37 +0000 @@ -580,7 +580,10 @@ t) (nnimap-expunge (nnimap-command "EXPUNGE") - t)))) + t) + (t (gnus-message 7 (concat "nnimap: nnimap-expunge is not set and the " + "server doesn't support UIDPLUS, so we won't " + "delete this article now")))))) (deffoo nnimap-request-scan (&optional group server) (when (and (nnimap-possibly-change-group nil server) ------------------------------------------------------------ revno: 101537 author: Julien Danjou committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2010-09-22 12:49:48 +0000 message: Make gnus-group-add-icon work. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-09-22 12:14:12 +0000 +++ lisp/gnus/ChangeLog 2010-09-22 12:49:48 +0000 @@ -1,5 +1,9 @@ 2010-09-22 Julien Danjou + * gnus-group.el (gnus-group-update-hook): Call gnus-group-add-icon by + default. + (gnus-group-add-icon): Move to gnus-group.el, and rewrite so it works. + * gnus-html.el (gnus-html-wash-images): Use xml-substitute-special on images alt-text. (gnus-html-put-image): Put alt-text as help-echo. === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2010-09-21 23:13:46 +0000 +++ lisp/gnus/gnus-group.el 2010-09-22 12:49:48 +0000 @@ -292,13 +292,14 @@ :group 'gnus-exit :type 'hook) -(defcustom gnus-group-update-hook '(gnus-group-highlight-line) +(defcustom gnus-group-update-hook '(gnus-group-highlight-line gnus-group-add-icon) "Hook called when a group line is changed. The hook will not be called if `gnus-visual' is nil. -The default function `gnus-group-highlight-line' will -highlight the line according to the `gnus-group-highlight' -variable." +The default functions `gnus-group-highlight-line' will highlight +the line according to the `gnus-group-highlight' variable, and +`gnus-group-add-icon' will add an icon according to +`gnus-group-icon-list'" :group 'gnus-group-visual :type 'hook) @@ -1578,7 +1579,7 @@ ?m ? )) (gnus-tmp-moderated-string (if (eq gnus-tmp-moderated ?m) "(m)" "")) - (gnus-tmp-group-icon "==&&==") + (gnus-tmp-group-icon (propertize " " 'gnus-group-icon t)) (gnus-tmp-news-server (or (cadr gnus-tmp-method) "")) (gnus-tmp-news-method (or (car gnus-tmp-method) "")) (gnus-tmp-news-method-string @@ -1687,6 +1688,47 @@ (gnus-extent-start-open beg))) (goto-char p))) +(defun gnus-group-add-icon () + "Add an icon to the current line according to `gnus-group-icon-list'." + (save-excursion + (let* ((end (line-end-position)) + ;; now find out where the line starts and leave point there. + (beg (line-beginning-position))) + (save-restriction + (narrow-to-region beg end) + (goto-char beg) + (let ((mystart (text-property-any beg end 'gnus-group-icon t))) + (when mystart + (let* ((group (gnus-group-group-name)) + (entry (gnus-group-entry group)) + (unread (if (numberp (car entry)) (car entry) 0)) + (active (gnus-active group)) + (total (if active (1+ (- (cdr active) (car active))) 0)) + (info (nth 2 entry)) + (method (gnus-server-get-method group (gnus-info-method info))) + (marked (gnus-info-marks info)) + (mailp (memq 'mail (assoc (symbol-name + (car (or method gnus-select-method))) + gnus-valid-select-methods))) + (level (or (gnus-info-level info) gnus-level-killed)) + (score (or (gnus-info-score info) 0)) + (ticked (gnus-range-length (cdr (assq 'tick marked)))) + (group-age (gnus-group-timestamp-delta group)) + (inhibit-read-only t) + (list gnus-group-icon-list) + (myend (next-single-property-change + mystart 'gnus-group-icon))) + (while (and list + (not (eval (caar list)))) + (setq list (cdr list))) + (when list + (put-text-property + mystart myend + 'display + (append + (gnus-create-image (expand-file-name (cdar list))) + '(:ascent center))))))))))) + (defun gnus-group-update-group (group &optional visible-only) "Update all lines where GROUP appear. If VISIBLE-ONLY is non-nil, the group won't be displayed if it isn't ------------------------------------------------------------ revno: 101536 author: Julien Danjou committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2010-09-22 12:14:12 +0000 message: gnus-html.el (gnus-html-wash-images): Use xml-substitute-special on images alt-text. gnus-html.el (gnus-html-put-image): Put alt-text as help-echo. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-09-22 06:01:22 +0000 +++ lisp/gnus/ChangeLog 2010-09-22 12:14:12 +0000 @@ -1,3 +1,9 @@ +2010-09-22 Julien Danjou + + * gnus-html.el (gnus-html-wash-images): Use xml-substitute-special on + images alt-text. + (gnus-html-put-image): Put alt-text as help-echo. + 2010-09-22 Katsumi Yamaoka * mailcap.el (mailcap-parse-mailcap, mailcap-parse-mimetypes) === modified file 'lisp/gnus/gnus-html.el' --- lisp/gnus/gnus-html.el 2010-09-21 11:48:40 +0000 +++ lisp/gnus/gnus-html.el 2010-09-22 12:14:12 +0000 @@ -35,6 +35,7 @@ (require 'mm-url) (require 'url) (require 'url-cache) +(require 'xml) (defcustom gnus-html-image-cache-ttl (days-to-time 7) "Time in seconds used to cache the image on disk." @@ -175,7 +176,7 @@ ;; Normal, external URL. (let ((alt-text (when (string-match "\\(alt\\|title\\)=\"\\([^\"]+\\)" parameters) - (match-string 2 parameters)))) + (xml-substitute-special (match-string 2 parameters))))) (if (gnus-html-image-url-blocked-p url (if (buffer-live-p gnus-summary-buffer) @@ -403,6 +404,7 @@ (let ((image (gnus-html-rescale-image image data size))) (delete-region start end) (gnus-put-image image alt-text 'external) + (gnus-put-text-property start (point) 'help-echo alt-text) (gnus-overlay-put (gnus-make-overlay start (point)) 'local-map gnus-html-displayed-image-map) (gnus-put-text-property start (point) 'gnus-alt-text alt-text) ------------------------------------------------------------ revno: 101535 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2010-09-22 11:45:26 +0200 message: Fix the MSDOS build (broken by revno 101511). sed1v2.inp (LINKER): Don't edit, variable was removed from src/Makefile.in. (LD_FIRSTFLAG): Edit to empty. diff: === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2010-09-17 12:44:56 +0000 +++ msdos/ChangeLog 2010-09-22 09:45:26 +0000 @@ -1,3 +1,9 @@ +2010-09-22 Eli Zaretskii + + * sed1v2.inp (LINKER): Don't edit, variable was removed from + src/Makefile.in. + (LD_FIRSTFLAG): Edit to empty. + 2010-09-17 Eli Zaretskii * sed1v2.inp (LIBXML2_LIBS, LIBXML2_CFLAGS): Edit to empty. === modified file 'msdos/sed1v2.inp' --- msdos/sed1v2.inp 2010-09-17 12:44:56 +0000 +++ msdos/sed1v2.inp 2010-09-22 09:45:26 +0000 @@ -31,6 +31,7 @@ /^ALL_CFLAGS *=/s/@[^@\n]*@//g /^CPPFLAGS *=/s/@[^@\n]*@// /^LDFLAGS *=/s/@[^@\n]*@// +/^LD_FIRSTFLAG *=/s/@[^@\n]*@// /^LIBS *=/s/@[^@\n]*@// /^LIBES *=/,/^ *$/ { s/@[^@\n]*@//g @@ -51,7 +52,6 @@ /^TEMACS_LDFLAGS2 *=/s/@TEMACS_LDFLAGS2@/$(LDFLAGS)/ /^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@// /^LIB_GCC *=/s/@LIB_GCC@// -/^LD *=/s/@LINKER@/$(CC)/ /^LIB_STANDARD *=/s/@LIB_STANDARD@// /^LIB_MATH *=/s/@LIB_MATH@/-lm/ /^LIBTIFF *=/s/@LIBTIFF@// ------------------------------------------------------------ revno: 101534 committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2010-09-22 06:01:22 +0000 message: Remove Emacs 21 stuff. mailcap.el (mailcap-parse-mailcap, mailcap-parse-mimetypes) mm-util.el (mm-decompress-buffer) nnir.el (nnir-run-find-grep) pop3.el (pop3-list): Use 3rd arg of split-string. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-09-21 23:13:46 +0000 +++ lisp/gnus/ChangeLog 2010-09-22 06:01:22 +0000 @@ -1,3 +1,10 @@ +2010-09-22 Katsumi Yamaoka + + * mailcap.el (mailcap-parse-mailcap, mailcap-parse-mimetypes) + * mm-util.el (mm-decompress-buffer) + * nnir.el (nnir-run-find-grep) + * pop3.el (pop3-list): Use 3rd arg of split-string. + 2010-09-21 Adam Sjøgren * gnus-sum.el (gnus-adjust-marked-articles): Fix typo. === modified file 'lisp/gnus/mailcap.el' --- lisp/gnus/mailcap.el 2010-09-02 00:55:51 +0000 +++ lisp/gnus/mailcap.el 2010-09-22 06:01:22 +0000 @@ -423,7 +423,7 @@ "/usr/local/etc/mailcap")))) (let ((fnames (reverse (if (stringp path) - (delete "" (split-string path path-separator)) + (split-string path path-separator t) path))) fname) (while fnames @@ -941,7 +941,7 @@ "/usr/local/etc/mime-types" "/usr/local/www/conf/mime-types")))) (let ((fnames (reverse (if (stringp path) - (delete "" (split-string path path-separator)) + (split-string path path-separator t) path))) fname) (while fnames === modified file 'lisp/gnus/mm-util.el' --- lisp/gnus/mm-util.el 2010-09-04 00:45:13 +0000 +++ lisp/gnus/mm-util.el 2010-09-22 06:01:22 +0000 @@ -1539,14 +1539,13 @@ prog t (list t err-file) nil args) jka-compr-acceptable-retval-list) (erase-buffer) - (insert (mapconcat - 'identity - (delete "" (split-string - (prog2 - (insert-file-contents err-file) - (buffer-string) - (erase-buffer)))) - " ") + (insert (mapconcat 'identity + (split-string + (prog2 + (insert-file-contents err-file) + (buffer-string) + (erase-buffer)) t) + " ") "\n") (setq err-msg (format "Error while executing \"%s %s < %s\"" === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2010-09-18 23:36:29 +0000 +++ lisp/gnus/nnir.el 2010-09-22 06:01:22 +0000 @@ -1536,17 +1536,13 @@ "find" group "-type" "f" "-name" "[0-9]*" "-exec" "grep" `("-l" ,@(and grep-options - ;; Note: the 3rd arg of `split-string' is not - ;; available in Emacs 21. - (delete "" (split-string grep-options "\\s-"))) + (split-string grep-options "\\s-" t)) "-e" ,regexp "{}" "+")))) ;; Translate relative paths to group names. (while (not (eobp)) - (let* ((path (delete - "" - (split-string - (buffer-substring (point) (line-end-position)) "/"))) + (let* ((path (split-string + (buffer-substring (point) (line-end-position)) "/" t)) (art (string-to-number (car (last path))))) (while (string= "." (car path)) (setq path (cdr path))) === modified file 'lisp/gnus/pop3.el' --- lisp/gnus/pop3.el 2010-09-18 10:21:30 +0000 +++ lisp/gnus/pop3.el 2010-09-22 06:01:22 +0000 @@ -520,8 +520,7 @@ (mapcar #'(lambda (s) (let ((split (split-string s " "))) (cons (string-to-number (nth 0 split)) (string-to-number (nth 1 split))))) - (delete "" (split-string (buffer-substring start end) - "\r\n")))))))) + (split-string (buffer-substring start end) "\r\n" t))))))) (defun pop3-retr (process msg crashbuf) "Retrieve message-id MSG to buffer CRASHBUF."