Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 101219. ------------------------------------------------------------ revno: 101219 committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2010-08-30 06:44:58 +0000 message: gnus.texi (Drafts): Mention B DEL by Lars Magne Ingebrigtsen . 2010-08-29 Lars Magne Ingebrigtsen * gnus.texi (Drafts): Mention B DEL. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-08-30 06:40:00 +0000 +++ doc/misc/ChangeLog 2010-08-30 06:44:58 +0000 @@ -1,3 +1,7 @@ +2010-08-29 Lars Magne Ingebrigtsen + + * gnus.texi (Drafts): Mention B DEL. + 2010-08-29 Tim Landscheidt (tiny change) * gnus.texi (Delayed Articles): Mention that the Date header is the === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2010-08-30 06:40:00 +0000 +++ doc/misc/gnus.texi 2010-08-30 06:44:58 +0000 @@ -13623,6 +13623,9 @@ @kbd{D t} (@code{gnus-draft-toggle-sending}) command to mark the message as unsendable. This is a toggling command. +Finally, if you want to delete a draft, use the normal @kbd{B DEL} +command (@pxref{Mail Group Commands}). + @node Rejected Articles @section Rejected Articles ------------------------------------------------------------ revno: 101218 committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2010-08-30 06:40:00 +0000 message: gnus.texi (Delayed Articles): Mention that the Date header is the original one, even if you delay by Tim Landscheidt . 2010-08-29 Tim Landscheidt (tiny change) * gnus.texi (Delayed Articles): Mention that the Date header is the original one, even if you delay. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-08-30 06:36:12 +0000 +++ doc/misc/ChangeLog 2010-08-30 06:40:00 +0000 @@ -1,3 +1,8 @@ +2010-08-29 Tim Landscheidt (tiny change) + + * gnus.texi (Delayed Articles): Mention that the Date header is the + original one, even if you delay. + 2010-08-29 Lars Magne Ingebrigtsen * gnus.texi (Asynchronous Fetching): Document === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2010-08-30 06:36:12 +0000 +++ doc/misc/gnus.texi 2010-08-30 06:40:00 +0000 @@ -6758,6 +6758,12 @@ Just don't forget to set that up :-) @end table +When delaying an article with @kbd{C-c C-j}, Message mode will +automatically add a @code{"Date"} header with the current time. In +many cases you probably want the @code{"Date"} header to reflect the +time the message is sent instead. To do this, you have to delete +@code{Date} from @code{message-draft-headers}. + @node Marking Articles @section Marking Articles ------------------------------------------------------------ revno: 101217 committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2010-08-30 06:36:12 +0000 message: gnus.texi (Asynchronous Fetching): Document gnus-async-post-fetch-function; gnus.texi (HTML): Made into its own section by Lars Magne Ingebrigtsen . 2010-08-29 Lars Magne Ingebrigtsen * gnus.texi (Asynchronous Fetching): Document gnus-async-post-fetch-function. (HTML): Made into its own section. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-08-26 07:39:39 +0000 +++ doc/misc/ChangeLog 2010-08-30 06:36:12 +0000 @@ -1,3 +1,9 @@ +2010-08-29 Lars Magne Ingebrigtsen + + * gnus.texi (Asynchronous Fetching): Document + gnus-async-post-fetch-function. + (HTML): Made into its own section. + 2010-08-26 Michael Albinus Sync with Tramp 2.1.19. === modified file 'doc/misc/emacs-mime.texi' --- doc/misc/emacs-mime.texi 2010-06-24 07:10:51 +0000 +++ doc/misc/emacs-mime.texi 2010-08-30 06:36:12 +0000 @@ -394,7 +394,7 @@ @item mm-text-html-renderer @vindex mm-text-html-renderer This selects the function used to render @acronym{HTML}. The predefined -renderers are selected by the symbols @code{w3}, +renderers are selected by the symbols @code{gnus-article-html}, @code{w3}, @code{w3m}@footnote{See @uref{http://emacs-w3m.namazu.org/} for more information about emacs-w3m}, @code{links}, @code{lynx}, @code{w3m-standalone} or @code{html2text}. If @code{nil} use an === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2010-07-10 18:52:53 +0000 +++ doc/misc/gnus.texi 2010-08-30 06:36:12 +0000 @@ -6043,6 +6043,11 @@ This variable can also be a number. In that case, center the window at the given number of lines from the top. +@item gnus-summary-stop-at-end-of-message +@vindex gnus-summary-stop-at-end-of-message +If non-@code{nil}, don't go to the next article when hitting +@kbd{SPC}, and you're at the end of the article. + @end table @@ -8271,6 +8276,16 @@ preferably be short and sweet to avoid slowing down Gnus too much. It's probably a good idea to byte-compile things like this. +@vindex gnus-async-post-fetch-function +@findex gnus-html-prefetch-images +After an article has been prefetched, this +@code{gnus-async-post-fetch-function} will be called. The buffer will +be narrowed to the region of the article that was fetched. A useful +value would be @code{gnus-html-prefetch-images}, which will prefetch +and store images referenced in the article, so that you don't have to +wait for them to be fetched when you read the article. This is useful +for @acronym{HTML} messages that have external images. + @vindex gnus-prefetched-article-deletion-strategy Articles have to be removed from the asynch buffer sooner or later. The @code{gnus-prefetched-article-deletion-strategy} says when to remove @@ -12186,6 +12201,7 @@ @menu * Hiding Headers:: Deciding what headers should be displayed. * Using MIME:: Pushing articles through @acronym{MIME} before reading them. +* HTML:: Reading @acronym{HTML} messages. * Customizing Articles:: Tailoring the look of the articles. * Article Keymap:: Keystrokes available in the article buffer. * Misc Article:: Other stuff. @@ -12482,6 +12498,48 @@ Also @pxref{MIME Commands}. +@node HTML +@section @acronym{HTML} +@cindex @acronym{HTML} + +If you have @code{w3m} installed on your system, Gnus can display +@acronym{HTML} articles in the article buffer. There are many Gnus +add-ons for doing this, using various approaches, but there's one +(sort of) built-in method that's used by default. + +For a complete overview, consult @xref{Display Customization, +,Display Customization, emacs-mime, The Emacs MIME Manual}. This +section only describes the default method. + +@table @code +@item mm-text-html-renderer +@vindex mm-text-html-renderer +If set to @code{gnus-article-html}, Gnus will use the built-in method, +that's based on @code{curl} and @code{w3m}. + +@item gnus-html-cache-directory +@vindex gnus-html-cache-directory +Gnus will download and cache images according to how +@code{mm-w3m-safe-url-regexp} is set. These images will be stored in +this directory. + +@item gnus-html-cache-size +@vindex gnus-html-cache-size +When @code{gnus-html-cache-size} bytes have been used in that +directory, the oldest files will be deleted. The default is 500MB. + +@item gnus-html-frame-width +@vindex gnus-html-frame-width +The width to use when rendering HTML. The default is 70. + +@end table + +To use this, make sure that you have @code{w3m} and @code{curl} +installed. If you have, then Gnus should display @acronym{HTML} +automatically. + + + @node Customizing Articles @section Customizing Articles @cindex article customization === modified file 'doc/misc/message.texi' --- doc/misc/message.texi 2010-06-24 07:10:51 +0000 +++ doc/misc/message.texi 2010-08-30 06:36:12 +0000 @@ -1645,7 +1645,8 @@ @cindex split large message The limitation of messages sent as message/partial. The lower bound of message size in characters, beyond which the message should be sent -in several parts. If it is @code{nil}, the size is unlimited. +in several parts. If it is @code{nil} (which is the default), the +size is unlimited. @end table ------------------------------------------------------------ revno: 101216 committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2010-08-30 06:32:33 +0000 message: gnus-score-string: Fix regex for matching extra headers and regexp-quote the match if necessary by Andreas Schwab . 2009-02-04 Andreas Schwab * gnus-score.el (gnus-score-string): Fix regex for matching extra headers and regexp-quote the match if necessary. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-08-30 06:28:53 +0000 +++ lisp/gnus/ChangeLog 2010-08-30 06:32:33 +0000 @@ -1,3 +1,8 @@ +2009-02-04 Andreas Schwab + + * gnus-score.el (gnus-score-string): Fix regex for matching extra + headers and regexp-quote the match if necessary. + 2009-03-24 Miles Bader * smiley.el (smiley-regexp-alist): Don't delete the semicolon before === modified file 'lisp/gnus/gnus-score.el' --- lisp/gnus/gnus-score.el 2010-01-13 08:35:10 +0000 +++ lisp/gnus/gnus-score.el 2010-08-30 06:32:33 +0000 @@ -2055,8 +2055,11 @@ ;; Evil hackery to make match usable in non-standard headers. (when extra - (setq match (concat "[ (](" extra " \\. \"[^)]*" - match "[^\"]*\")[ )]") + (setq match (concat "[ (](" extra " \\. \"\\([^\"]*\\\\\"\\)*[^\"]*" + (if (eq search-func 're-search-forward) + match + (regexp-quote match)) + "\\([^\"]*\\\\\"\\)*[^\"]*\")[ )]") search-func 're-search-forward)) ; XXX danger?!? (cond ------------------------------------------------------------ revno: 101215 committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2010-08-30 06:28:53 +0000 message: smiley-regexp-alist: Don't delete the semicolon before the blinking smiley by Miles Bader ; Disallow ;;) from being treated as a blink smiley by Simon Josefsson . 2009-03-24 Miles Bader * smiley.el (smiley-regexp-alist): Don't delete the semicolon before the blinking smiley. 2009-03-24 Simon Josefsson * smiley.el (smiley-regexp-alist): Disallow ;;) from being treated as a blink smiley. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-08-30 06:25:05 +0000 +++ lisp/gnus/ChangeLog 2010-08-30 06:28:53 +0000 @@ -1,3 +1,13 @@ +2009-03-24 Miles Bader + + * smiley.el (smiley-regexp-alist): Don't delete the semicolon before + the blinking smiley. + +2009-03-24 Simon Josefsson + + * smiley.el (smiley-regexp-alist): Disallow ;;) from being treated as a + blink smiley. + 2010-08-29 Lars Magne Ingebrigtsen * gnus-start.el (gnus-dribble-read-file): Ensure that the directory === modified file 'lisp/gnus/smiley.el' --- lisp/gnus/smiley.el 2010-03-22 15:49:52 +0000 +++ lisp/gnus/smiley.el 2010-08-30 06:28:53 +0000 @@ -102,7 +102,8 @@ ;; The XEmacs version has a baroque, if not rococo, set of these. (defcustom smiley-regexp-alist - '(("\\(;-?)\\)\\W" 1 "blink") + '(("\\(;-)\\)\\W" 1 "blink") + ("[^;]\\(;)\\)\\W" 1 "blink") ("\\(:-]\\)\\W" 1 "forced") ("\\(8-)\\)\\W" 1 "braindamaged") ("\\(:-|\\)\\W" 1 "indifferent") ------------------------------------------------------------ revno: 101214 committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2010-08-30 06:25:05 +0000 message: Misc Gnus fixes by Lars Magne Ingebrigtsen . 2010-08-29 Lars Magne Ingebrigtsen * gnus-start.el (gnus-dribble-read-file): Ensure that the directory where the dribbel file lives exists. * message.el (message-send-mail-partially-limit): Change the default to nil, since most people don't want this. * mm-url.el (mm-url-decode-entities): Also decode entities like ㈒. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-08-30 06:21:33 +0000 +++ lisp/gnus/ChangeLog 2010-08-30 06:25:05 +0000 @@ -1,3 +1,14 @@ +2010-08-29 Lars Magne Ingebrigtsen + + * gnus-start.el (gnus-dribble-read-file): Ensure that the directory + where the dribbel file lives exists. + + * message.el (message-send-mail-partially-limit): Change the default to + nil, since most people don't want this. + + * mm-url.el (mm-url-decode-entities): Also decode entities like + ㈒. + 2009-07-16 Kevin Ryde (tiny change) * gnus-sum.el (gnus-summary-idna-message): === modified file 'lisp/gnus/gnus-start.el' --- lisp/gnus/gnus-start.el 2010-08-15 23:30:04 +0000 +++ lisp/gnus/gnus-start.el 2010-08-30 06:25:05 +0000 @@ -869,6 +869,8 @@ (defun gnus-dribble-read-file () "Read the dribble file from disk." (let ((dribble-file (gnus-dribble-file-name))) + (unless (file-exists-p (file-name-directory dribble-file)) + (make-directory (file-name-directory dribble-file) t)) (save-excursion (set-buffer (setq gnus-dribble-buffer (gnus-get-buffer-create === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2010-08-30 06:10:18 +0000 +++ lisp/gnus/message.el 2010-08-30 06:25:05 +0000 @@ -1620,7 +1620,7 @@ and Emacs, you may use `iso-2022-7bit' for this value at your own risk. Note that the coding-system `iso-2022-7bit' isn't suitable to all data.") -(defcustom message-send-mail-partially-limit 1000000 +(defcustom message-send-mail-partially-limit nil "The limitation of messages sent as message/partial. The lower bound of message size in characters, beyond which the message should be sent in several parts. If it is nil, the size is unlimited." === modified file 'lisp/gnus/mm-url.el' --- lisp/gnus/mm-url.el 2010-08-17 07:00:16 +0000 +++ lisp/gnus/mm-url.el 2010-08-30 06:25:05 +0000 @@ -365,15 +365,20 @@ (defun mm-url-decode-entities () "Decode all HTML entities." (goto-char (point-min)) - (while (re-search-forward "&\\(#[0-9]+\\|[a-z]+[0-9]*\\);" nil t) - (let ((elem (if (eq (aref (match-string 1) 0) ?\#) - (let ((c (mm-ucs-to-char - (string-to-number - (substring (match-string 1) 1))))) - (if (mm-char-or-char-int-p c) c ?#)) - (or (cdr (assq (intern (match-string 1)) - mm-url-html-entities)) - ?#)))) + (while (re-search-forward "&\\(#[0-9]+\\|#x[0-9a-f]+\\|[a-z]+[0-9]*\\);" nil t) + (let* ((entity (match-string 1)) + (elem (if (eq (aref entity 0) ?\#) + (let ((c (mm-ucs-to-char + ;; Hex number: ㈒ + (if (eq (aref entity 1) ?x) + (string-to-number (substring entity 2) + 16) + ;; Decimal number:  + (string-to-number (substring entity 1)))))) + (if (mm-char-or-char-int-p c) c ?#)) + (or (cdr (assq (intern entity) + mm-url-html-entities)) + ?#)))) (unless (stringp elem) (setq elem (char-to-string elem))) (replace-match elem t t)))) ------------------------------------------------------------ revno: 101213 committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2010-08-30 06:21:33 +0000 message: gnus-summary-idna-message, nnrss-normalize-date, nnrss-discover-feed: Hyperlink urls in docstrings with URL `...' by Kevin Ryde . 2009-07-16 Kevin Ryde (tiny change) * gnus-sum.el (gnus-summary-idna-message): * nnrss.el (nnrss-normalize-date, nnrss-discover-feed): Hyperlink urls in docstrings with URL `...'. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-08-30 06:17:45 +0000 +++ lisp/gnus/ChangeLog 2010-08-30 06:21:33 +0000 @@ -1,3 +1,9 @@ +2009-07-16 Kevin Ryde (tiny change) + + * gnus-sum.el (gnus-summary-idna-message): + * nnrss.el (nnrss-normalize-date, nnrss-discover-feed): + Hyperlink urls in docstrings with URL `...'. + 2010-08-29 Adam Sjøgren * gnus-html.el (gnus-html-put-image): Use XEmacs-compatible image === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2010-08-30 06:17:45 +0000 +++ lisp/gnus/gnus-sum.el 2010-08-30 06:21:33 +0000 @@ -9524,7 +9524,7 @@ remain unencoded after running this function, it is likely an invalid IDNA string (`xn--bar' is invalid). -You must have GNU Libidn (`http://www.gnu.org/software/libidn/') +You must have GNU Libidn (URL `http://www.gnu.org/software/libidn/') installed for this command to work." (interactive "P") (if (not (and (condition-case nil (require 'idna) === modified file 'lisp/gnus/nnrss.el' --- lisp/gnus/nnrss.el 2010-05-25 02:11:08 +0000 +++ lisp/gnus/nnrss.el 2010-08-30 06:21:33 +0000 @@ -498,7 +498,7 @@ (defun nnrss-normalize-date (date) "Return a date string of DATE in the RFC822 style. This function handles the ISO 8601 date format described in -, and also the RFC822 style +URL `http://www.w3.org/TR/NOTE-datetime', and also the RFC822 style which RSS 2.0 allows." (let (case-fold-search vector year month day time zone cts given) (cond ((null date)) ; do nothing for this case @@ -1012,7 +1012,7 @@ (defun nnrss-discover-feed (url) "Given a page, find an RSS feed using Mark Pilgrim's -`ultra-liberal rss locator' (http://diveintomark.org/2002/08/15.html)." +`ultra-liberal rss locator' (URL `http://diveintomark.org/2002/08/15.html')." (let ((parsed-page (nnrss-fetch url))) ------------------------------------------------------------ revno: 101212 committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2010-08-30 06:17:45 +0000 message: Misc Gnus fixes by Lars Magne Ingebrigtsen . 2010-08-29 Adam Sjøgren * gnus-html.el (gnus-html-put-image): Use XEmacs-compatible image functions. 2010-08-29 Lars Magne Ingebrigtsen * gnus-art.el (gnus-article-add-button): Take an optional parameter to say what the mouseover text should be. * gnus-html.el (gnus-html-prefetch-images): Use the summary-local version of the mm-w3m-safe-url-regexp variable to only download images in the groups where we want that to happen. * gnus-sum.el (gnus-summary-stop-at-end-of-message): New variable. * gnus-art.el (gnus-article-beginning-of-window): Make into defun for easier debugging. (gnus-article-beginning-of-window): Add kludge to allow spacing past big pictures in the article buffer. * mm-decode.el (mm-text-html-renderer): Default the html renderer to gnus-article-html. (mm-text-html-renderer): gnus-article-html needs curl in addition to w3m. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-08-30 06:13:50 +0000 +++ lisp/gnus/ChangeLog 2010-08-30 06:17:45 +0000 @@ -1,5 +1,29 @@ +2010-08-29 Adam Sjøgren + + * gnus-html.el (gnus-html-put-image): Use XEmacs-compatible image + functions. + 2010-08-29 Lars Magne Ingebrigtsen + * gnus-art.el (gnus-article-add-button): Take an optional parameter to + say what the mouseover text should be. + + * gnus-html.el (gnus-html-prefetch-images): Use the summary-local + version of the mm-w3m-safe-url-regexp variable to only download images + in the groups where we want that to happen. + + * gnus-sum.el (gnus-summary-stop-at-end-of-message): New variable. + + * gnus-art.el (gnus-article-beginning-of-window): Make into defun for + easier debugging. + (gnus-article-beginning-of-window): Add kludge to allow spacing past + big pictures in the article buffer. + + * mm-decode.el (mm-text-html-renderer): Default the html renderer to + gnus-article-html. + (mm-text-html-renderer): gnus-article-html needs curl in addition to + w3m. + * gnus-html.el: Start a new super-simple HTML renderer based on w3m. 2010-08-28 Lars Magne Ingebrigtsen === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2010-08-17 07:00:16 +0000 +++ lisp/gnus/gnus-art.el 2010-08-30 06:17:45 +0000 @@ -6283,18 +6283,22 @@ (gnus-article-next-page-1 lines) nil)) -(defmacro gnus-article-beginning-of-window () +(defun gnus-article-beginning-of-window () "Move point to the beginning of the window. In Emacs, the point is placed at the line number which `scroll-margin' specifies." (if (featurep 'xemacs) - '(move-to-window-line 0) - '(move-to-window-line - (min (max 0 scroll-margin) - (max 1 (- (window-height) - (if mode-line-format 1 0) - (if header-line-format 1 0) - 2)))))) + (move-to-window-line 0) + ;; There is an obscure bug in Emacs that makes it impossible to + ;; scroll past big pictures in the article buffer. Try to fix + ;; this by adding a sanity check by counting the lines visible. + (when (> (count-lines (window-start) (window-end)) 30) + (move-to-window-line + (min (max 0 scroll-margin) + (max 1 (- (window-height) + (if mode-line-format 1 0) + (if header-line-format 1 0) + 2))))))) (defun gnus-article-next-page-1 (lines) (unless (featurep 'xemacs) @@ -7899,7 +7903,7 @@ ;;; External functions: -(defun gnus-article-add-button (from to fun &optional data) +(defun gnus-article-add-button (from to fun &optional data text) "Create a button between FROM and TO with callback FUN and data DATA." (when gnus-article-button-face (gnus-overlay-put (gnus-make-overlay from to nil t) @@ -7911,6 +7915,7 @@ (list 'gnus-callback fun) (and data (list 'gnus-data data)))) (widget-convert-button 'link from to :action 'gnus-widget-press-button + :help-echo (or text "Follow the link") :button-keymap gnus-widget-button-keymap)) ;;; Internal functions: === modified file 'lisp/gnus/gnus-async.el' --- lisp/gnus/gnus-async.el 2010-01-13 08:35:10 +0000 +++ lisp/gnus/gnus-async.el 2010-08-30 06:17:45 +0000 @@ -71,6 +71,13 @@ :group 'gnus-asynchronous :type 'function) +(defcustom gnus-async-post-fetch-function nil + "Function called after an article has been prefetched. +The function will be called narrowed to the region of the article +that was fetched." + :group 'gnus-asynchronous + :type 'function) + ;;; Internal variables. (defvar gnus-async-prefetch-article-buffer " *Async Prefetch Article*") @@ -227,6 +234,11 @@ (setq gnus-async-current-prefetch-article nil) (when arg (gnus-async-set-buffer) + (when gnus-async-post-fetch-function + (save-excursion + (save-restriction + (narrow-to-region mark (point-max)) + (funcall gnus-async-post-fetch-function summary)))) (gnus-async-with-semaphore (setq gnus-async-article-alist === modified file 'lisp/gnus/gnus-html.el' --- lisp/gnus/gnus-html.el 2010-08-30 06:13:50 +0000 +++ lisp/gnus/gnus-html.el 2010-08-30 06:17:45 +0000 @@ -28,42 +28,85 @@ ;;; Code: +(defcustom gnus-html-cache-directory (nnheader-concat gnus-directory "html-cache/") + "Where Gnus will cache images it downloads from the web." + :group 'gnus-art + :type 'directory) + +(defcustom gnus-html-cache-size 500000000 + "The size of the Gnus image cache." + :group 'gnus-art + :type 'integer) + +(defcustom gnus-html-frame-width 70 + "What width to use when rendering HTML." + :group 'gnus-art + :type 'integer) + ;;;###autoload (defun gnus-article-html (handle) (let ((article-buffer (current-buffer))) (save-restriction (narrow-to-region (point) (point)) (save-excursion - (set-buffer (car handle)) - (call-process-region (point-min) (point-max) - "w3m" - nil article-buffer nil - "-halfdump" - "-T" "text/html")) + (mm-with-part handle + (let* ((coding-system-for-read 'utf-8) + (coding-system-for-write 'utf-8) + (default-process-coding-system + (cons coding-system-for-read coding-system-for-write))) + (call-process-region (point-min) (point-max) + "w3m" + nil article-buffer nil + "-halfdump" + "-no-cookie" + "-O" "UTF-8" + "-o" "ext_halfdump=1" + "-t" (format "%s" tab-width) + "-cols" (format "%s" gnus-html-frame-width) + "-o" "display_image=off" + "-T" "text/html")))) (gnus-html-wash-tags)))) (defun gnus-html-wash-tags () - (let (tag parameters string start end) - ;;(subst-char-in-region (point-min) (point-max) ?_ ? ) + (let (tag parameters string start end images) + (mm-url-decode-entities) (goto-char (point-min)) - (while (re-search-forward "<\\([^ ]+\\)\\([^>]*\\)>\\([^<]*\\)<[^>]*>" nil t) + (while (re-search-forward "<\\([^ />]+\\)\\([^>]*\\)>" nil t) (setq tag (match-string 1) parameters (match-string 2) - string (match-string 3) - start (match-beginning 0) - end (+ start (length string))) - (replace-match string) + start (match-beginning 0)) + (when (plusp (length parameters)) + (set-text-properties 0 (1- (length parameters)) nil parameters)) + (delete-region start (point)) + (when (search-forward (concat "") nil t) + (delete-region (match-beginning 0) (match-end 0))) + (setq end (point)) (cond ;; Fetch and insert a picture. ((equal tag "img_alt") - ;; - ) + (when (string-match "src=\"\\([^\"]+\\)" parameters) + (setq parameters (match-string 1 parameters)) + (when (or (null mm-w3m-safe-url-regexp) + (string-match mm-w3m-safe-url-regexp parameters)) + (let ((file (gnus-html-image-id parameters))) + (if (file-exists-p file) + ;; It's already cached, so just insert it. + (when (gnus-html-put-image file (point)) + ;; Delete the ALT text. + (delete-region start end)) + ;; We don't have it, so schedule it for fetching + ;; asynchronously. + (push (list parameters + (set-marker (make-marker) start) + (point-marker)) + images)))))) ;; Add a link. ((equal tag "a") (when (string-match "href=\"\\([^\"]+\\)" parameters) (setq parameters (match-string 1 parameters)) (gnus-article-add-button start end - 'browse-url parameters) + 'browse-url parameters + parameters) (let ((overlay (gnus-make-overlay start end))) (gnus-overlay-put overlay 'evaporate t) (gnus-overlay-put overlay 'gnus-button-url parameters) @@ -71,6 +114,113 @@ (gnus-overlay-put overlay 'mouse-face gnus-article-mouse-face))))) ;; Whatever. Just ignore the tag. (t - (replace-match string)))))) + )) + (goto-char start)) + (goto-char (point-min)) + ;; The output from -halfdump isn't totally regular, so strip + ;; off any s that were left over. + (while (re-search-forward "" nil t) + (replace-match "" t t)) + (when images + (gnus-html-schedule-image-fetching (current-buffer) (nreverse images))))) + +(defun gnus-html-schedule-image-fetching (buffer images) + (let* ((url (caar images)) + (process (start-process + "images" nil "curl" + "-s" "--create-dirs" + "--location" + "--max-time" "60" + "-o" (gnus-html-image-id url) + url))) + (process-kill-without-query process) + (set-process-sentinel process 'gnus-html-curl-sentinel) + (set-process-plist process (list 'images images + 'buffer buffer)))) + +(defun gnus-html-image-id (url) + (expand-file-name (sha1 url) gnus-html-cache-directory)) + +(defun gnus-html-curl-sentinel (process event) + (when (string-match "finished" event) + (let* ((images (getf (process-plist process) 'images)) + (buffer (getf (process-plist process) 'buffer)) + (spec (pop images)) + (file (gnus-html-image-id (car spec)))) + (when (and (buffer-live-p buffer) + ;; If the position of the marker is 1, then that + ;; means that the text is was in has been deleted; + ;; i.e., that the user has selected a different + ;; article before the image arrived. + (not (= (marker-position (cadr spec)) 1))) + (save-excursion + (set-buffer buffer) + (let ((buffer-read-only nil)) + (when (gnus-html-put-image file (cadr spec)) + (delete-region (cadr spec) (caddr spec)))))) + (when images + (gnus-html-schedule-image-fetching buffer images))))) + +(defun gnus-html-put-image (file point) + (let ((image (ignore-errors + (create-image file)))) + (if (and image + ;; Kludge to avoid displaying 30x30 gif images, which + ;; seems to be a signal of a broken image. + (not (and (eq (getf (cdr image) :type) 'gif) + (= (car (image-size image t)) 30) + (= (cdr (image-size image t)) 30)))) + (progn + (put-image image point) + t) + (when (fboundp 'find-image) + (put-image (find-image '((:type xpm :file "lock-broken.xpm"))) + point)) + nil))) + +(defun gnus-html-prune-cache () + (let ((total-size 0) + files) + (dolist (file (directory-files gnus-html-cache-directory t nil t)) + (let ((attributes (file-attributes file))) + (unless (nth 0 attributes) + (incf total-size (nth 7 attributes)) + (push (list (time-to-seconds (nth 5 attributes)) + (nth 7 attributes) file) + files)))) + (when (> total-size gnus-html-cache-size) + (setq files (sort files (lambda (f1 f2) + (< (car f1) (car f2))))) + (dolist (file files) + (when (> total-size gnus-html-cache-size) + (decf total-size (cadr file)) + (delete-file (nth 2 file))))))) + +;;;###autoload +(defun gnus-html-prefetch-images (summary) + (let (safe-url-regexp urls) + (when (buffer-live-p summary) + (save-excursion + (set-buffer summary) + (setq safe-url-regexp mm-w3m-safe-url-regexp)) + (save-match-data + (while (re-search-forward " branch nick: trunk timestamp: Mon 2010-08-30 06:13:50 +0000 message: Add a new super-simple HTML renderer based on w3m -halfdump by Lars Magne Ingebrigtsen . * gnus-html.el: Start a new super-simple HTML renderer based on w3m. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-08-30 06:10:18 +0000 +++ lisp/gnus/ChangeLog 2010-08-30 06:13:50 +0000 @@ -1,3 +1,7 @@ +2010-08-29 Lars Magne Ingebrigtsen + + * gnus-html.el: Start a new super-simple HTML renderer based on w3m. + 2010-08-28 Lars Magne Ingebrigtsen * gnus.el (gnus-valid-select-methods): Remove reference to nngoogle, === added file 'lisp/gnus/gnus-html.el' --- lisp/gnus/gnus-html.el 1970-01-01 00:00:00 +0000 +++ lisp/gnus/gnus-html.el 2010-08-30 06:13:50 +0000 @@ -0,0 +1,76 @@ +;;; gnus-html.el --- Quoted-Printable functions + +;; Copyright (C) 2010 Free Software Foundation, Inc. + +;; Author: Lars Magne Ingebrigtsen +;; Keywords: html, web + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;; The idea is to provide a simple, fast and pretty minimal way to +;; render HTML (including links and images) in a buffer, based on an +;; external HTML renderer (i.e., w3m). + +;;; Code: + +;;;###autoload +(defun gnus-article-html (handle) + (let ((article-buffer (current-buffer))) + (save-restriction + (narrow-to-region (point) (point)) + (save-excursion + (set-buffer (car handle)) + (call-process-region (point-min) (point-max) + "w3m" + nil article-buffer nil + "-halfdump" + "-T" "text/html")) + (gnus-html-wash-tags)))) + +(defun gnus-html-wash-tags () + (let (tag parameters string start end) + ;;(subst-char-in-region (point-min) (point-max) ?_ ? ) + (goto-char (point-min)) + (while (re-search-forward "<\\([^ ]+\\)\\([^>]*\\)>\\([^<]*\\)<[^>]*>" nil t) + (setq tag (match-string 1) + parameters (match-string 2) + string (match-string 3) + start (match-beginning 0) + end (+ start (length string))) + (replace-match string) + (cond + ;; Fetch and insert a picture. + ((equal tag "img_alt") + ;; + ) + ;; Add a link. + ((equal tag "a") + (when (string-match "href=\"\\([^\"]+\\)" parameters) + (setq parameters (match-string 1 parameters)) + (gnus-article-add-button start end + 'browse-url parameters) + (let ((overlay (gnus-make-overlay start end))) + (gnus-overlay-put overlay 'evaporate t) + (gnus-overlay-put overlay 'gnus-button-url parameters) + (when gnus-article-mouse-face + (gnus-overlay-put overlay 'mouse-face gnus-article-mouse-face))))) + ;; Whatever. Just ignore the tag. + (t + (replace-match string)))))) + +;;; gnus-html.el ends here ------------------------------------------------------------ revno: 101210 committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2010-08-30 06:10:18 +0000 message: Misc Gnus fixes by Lars Magne Ingebrigtsen . 2010-08-28 Lars Magne Ingebrigtsen * gnus.el (gnus-valid-select-methods): Remove reference to nngoogle, which doesn't exist. * message.el (message-inhibit-ecomplete): New variable to allow some function to inhibit ecomplete address storage. (message-resend): Disable ecomplete message storage when resending messages. * nntp.el (nntp-async-kluge): Remove the Emacs 20.3-related kluge. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-08-27 01:53:01 +0000 +++ lisp/gnus/ChangeLog 2010-08-30 06:10:18 +0000 @@ -1,3 +1,15 @@ +2010-08-28 Lars Magne Ingebrigtsen + + * gnus.el (gnus-valid-select-methods): Remove reference to nngoogle, + which doesn't exist. + + * message.el (message-inhibit-ecomplete): New variable to allow some + function to inhibit ecomplete address storage. + (message-resend): Disable ecomplete message storage when resending + messages. + + * nntp.el (nntp-async-kluge): Remove the Emacs 20.3-related kluge. + 2010-08-27 Katsumi Yamaoka * gnus-sum.el (gnus-summary-move-article, gnus-summary-delete-article): === modified file 'lisp/gnus/gnus.el' --- lisp/gnus/gnus.el 2010-08-29 20:10:43 +0000 +++ lisp/gnus/gnus.el 2010-08-30 06:10:18 +0000 @@ -1746,7 +1746,6 @@ ("nnfolder" mail respool address) ("nngateway" post-mail address prompt-address physical-address) ("nnweb" none) - ("nngoogle" post) ("nnslashdot" post) ("nnultimate" none) ("nnrss" none) === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2010-05-12 08:24:25 +0000 +++ lisp/gnus/message.el 2010-08-30 06:10:18 +0000 @@ -1739,6 +1739,7 @@ (defvar message-mime-part nil) (defvar message-posting-charset nil) (defvar message-inserted-headers nil) +(defvar message-inhibit-ecomplete nil) ;; Byte-compiler warning (defvar gnus-active-hashtb) @@ -4091,7 +4092,8 @@ (run-hooks 'message-sent-hook)) (message "Sending...done") ;; Do ecomplete address snarfing. - (when (message-mail-alias-type-p 'ecomplete) + (when (and (message-mail-alias-type-p 'ecomplete) + (not message-inhibit-ecomplete)) (message-put-addresses-in-ecomplete)) ;; Mark the buffer as unmodified and delete auto-save. (set-buffer-modified-p nil) @@ -7425,6 +7427,7 @@ (replace-match "X-From-Line: ")) ;; Send it. (let ((message-inhibit-body-encoding t) + (message-inhibit-ecomplete t) message-required-mail-headers message-generate-hashcash rfc2047-encode-encoded-words) === modified file 'lisp/gnus/nntp.el' --- lisp/gnus/nntp.el 2010-03-19 02:55:37 +0000 +++ lisp/gnus/nntp.el 2010-08-30 06:10:18 +0000 @@ -298,13 +298,6 @@ (defvoo nntp-server-xover 'try) (defvoo nntp-server-list-active-group 'try) -(defvar nntp-async-needs-kluge - (string-match "^GNU Emacs 20\\.3\\." (emacs-version)) - "*When non-nil, nntp will poll asynchronous connections -once a second. By default, this is turned on only for Emacs -20.3, which has a bug that breaks nntp's normal method of -noticing asynchronous data.") - (defvar nntp-async-timer nil) (defvar nntp-async-process-list nil) @@ -1368,17 +1361,7 @@ nntp-process-decode decode nntp-process-callback callback nntp-process-start-point (point-max)) - (setq after-change-functions '(nntp-after-change-function)) - (if nntp-async-needs-kluge - (nntp-async-kluge process)))) - -(defun nntp-async-kluge (process) - ;; emacs 20.3 bug: process output with encoding 'binary - ;; doesn't trigger after-change-functions. - (unless nntp-async-timer - (setq nntp-async-timer - (run-at-time 1 1 'nntp-async-timer-handler))) - (add-to-list 'nntp-async-process-list process)) + (setq after-change-functions '(nntp-after-change-function)))) (defun nntp-async-timer-handler () (mapcar ------------------------------------------------------------ revno: 101209 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Mon 2010-08-30 11:01:09 +0900 message: composite.c (composition_update_it): Fix previous change diff: === modified file 'src/composite.c' --- src/composite.c 2010-08-30 00:32:29 +0000 +++ src/composite.c 2010-08-30 01:58:52 +0000 @@ -1440,7 +1440,7 @@ { c = XINT (LGSTRING_CHAR (gstring, i)); cmp_it->nbytes += CHAR_BYTES (c); - cmp_it->width += LGLYPH_WIDTH (glyph) > 0 ? CHAR_WIDTH (c) : 0; + cmp_it->width += CHAR_WIDTH (c); } } return c; ------------------------------------------------------------ revno: 101208 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Mon 2010-08-30 09:33:17 +0900 message: composite.c (composition_update_it): Fix computing of cmp_it->width. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-08-29 10:30:45 +0000 +++ src/ChangeLog 2010-08-30 00:32:29 +0000 @@ -1,3 +1,8 @@ +2010-08-30 Kenichi Handa + + * composite.c (composition_update_it): Fix computing of + cmp_it->width. + 2010-08-29 Jan Djärv * nsterm.m (ns_draw_window_cursor): Draw BAR_CURSOR correct for R2L. === modified file 'src/composite.c' --- src/composite.c 2010-08-25 04:39:30 +0000 +++ src/composite.c 2010-08-30 00:32:29 +0000 @@ -1440,8 +1440,7 @@ { c = XINT (LGSTRING_CHAR (gstring, i)); cmp_it->nbytes += CHAR_BYTES (c); - cmp_it->width = (LGLYPH_WIDTH (glyph) > 0 - ? CHAR_WIDTH (LGLYPH_CHAR (glyph)) : 0); + cmp_it->width += LGLYPH_WIDTH (glyph) > 0 ? CHAR_WIDTH (c) : 0; } } return c; ------------------------------------------------------------ revno: 101207 committer: Chong Yidong branch nick: trunk timestamp: Sun 2010-08-29 18:15:09 -0400 message: Merge Finder and package-menu functionality. * lisp/finder.el: Require `package'. (finder-known-keywords): Tweak descriptions. Retire `oop' keyword. (finder-package-info): Var deleted. (finder-keywords-hash, finder--builtins-alist): New vars. (finder-compile-keywords): Compute package--builtins and finder-keywords-hash instead of finder-keywords-hash, respecting the "Package" header. (finder-unknown-keywords, finder-list-matches): Use finder-keywords-hash and package--list-packages. (finder-mode): Don't set font-lock-defaults. (finder-exit): We don't use "*Finder-package*" and "*Finder Category*" buffers anymore. * lisp/info.el (Info-finder-find-node): Search package-alist instead of finder-package-info. * lisp/emacs-lisp/package.el (package--builtins-base): Var deleted. (package--builtins): Set default value to nil. (package-initialize): Load precomputed value of package--builtins from finder-inf.el. (package-alist, package-compute-transaction) (package-download-transaction): Improve docstring. (package-read-all-archive-contents): Do not change package--builtins here. (list-packages): Make package-list-packages an alias for this. Sort by status by default. (package--list-packages): Add optional PACKAGES arg. (describe-package-1): Use font-lock-face property. For built-in packages, insert file commentary. (package--generate-package-list): Rename from package-list-packages-internal; all callers changed. Add optional PACKAGES arg. Add alphabetical sort fallbacks. (package-menu--version-predicate, package-menu--status-predicate) (package-menu--description-predicate) (package-menu--name-predicate): New functions. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-08-29 01:31:45 +0000 +++ lisp/ChangeLog 2010-08-29 22:15:09 +0000 @@ -1,5 +1,43 @@ 2010-08-29 Chong Yidong + * finder.el: Require `package'. + (finder-known-keywords): Tweak descriptions. Retire `oop' keyword. + (finder-package-info): Var deleted. + (finder-keywords-hash, finder--builtins-alist): New vars. + (finder-compile-keywords): Compute package--builtins and + finder-keywords-hash instead of finder-keywords-hash, respecting + the "Package" header. + (finder-unknown-keywords, finder-list-matches): Use + finder-keywords-hash and package--list-packages. + (finder-mode): Don't set font-lock-defaults. + (finder-exit): We don't use "*Finder-package*" and "*Finder + Category*" buffers anymore. + + * emacs-lisp/package.el (package--builtins-base): Var deleted. + (package--builtins): Set default value to nil. + (package-initialize): Load precomputed value of package--builtins + from finder-inf.el. + (package-alist, package-compute-transaction) + (package-download-transaction): Improve docstring. + (package-read-all-archive-contents): Do not change + package--builtins here. + (list-packages): Make package-list-packages an alias for this. + Sort by status by default. + (package--list-packages): Add optional PACKAGES arg. + (describe-package-1): Use font-lock-face property. For built-in + packages, insert file commentary. + (package--generate-package-list): Rename from + package-list-packages-internal; all callers changed. Add optional + PACKAGES arg. Add alphabetical sort fallbacks. + (package-menu--version-predicate, package-menu--status-predicate) + (package-menu--description-predicate) + (package-menu--name-predicate): New functions. + + * info.el (Info-finder-find-node): Search package-alist instead of + finder-package-info. + +2010-08-29 Chong Yidong + * subr.el (version-regexp-alist): Don't use "a" and "b" for "alpha" and "beta". (version-to-list): Handle versions like "10.3d". === modified file 'lisp/emacs-lisp/package.el' --- lisp/emacs-lisp/package.el 2010-08-26 03:31:34 +0000 +++ lisp/emacs-lisp/package.el 2010-08-29 22:15:09 +0000 @@ -273,46 +273,35 @@ :group 'package :version "24.1") -(defconst package--builtins-base - ;; We use package-version split here to make sure to pick up the - ;; minor version. - `((emacs . [,(version-to-list emacs-version) nil - "GNU Emacs"]) - (package . [,(version-to-list package-el-version) - nil "Simple package system for GNU Emacs"])) - "Packages which are always built-in.") +;; The value is precomputed in finder-inf.el, but don't load that +;; until it's needed (i.e. when `package-intialize' is called). +(defvar package--builtins nil + "Alist of built-in packages. +Each element has the form (PKG . DESC), where PKG is a package +name (a symbol) and DESC is a vector that describes the package. -(defvar package--builtins - (delq nil - (append - package--builtins-base - (if (>= emacs-major-version 22) - ;; FIXME: emacs 22 includes tramp, rcirc, maybe - ;; other things... - '((erc . [(5 2) nil "Internet Relay Chat client"]) - ;; The external URL is version 1.15, so make sure the - ;; built-in one looks newer. - (url . [(1 16) nil "URL handling libary"]))) - (if (>= emacs-major-version 23) - '(;; Strangely, nxml-version is missing in Emacs 23. - ;; We pick the merge date as the version. - (nxml . [(20071123) nil "Major mode for XML documents"]) - (bubbles . [(0 5) nil "A puzzle game"]))))) - "Alist of all built-in packages. -Maps the package name to a vector [VERSION REQS DOCSTRING].") +The vector DESC has the form [VERSION REQS DOCSTRING]. + VERSION is a version list. + REQS is a list of packages (symbols) required by the package. + DOCSTRING is a brief description of the package.") (put 'package--builtins 'risky-local-variable t) -(defvar package-alist package--builtins +(defvar package-alist nil "Alist of all packages available for activation. -This maps the package name to a vector [VERSION REQS DOCSTRING]. - -The value is generated by `package-load-descriptor', usually -called via `package-initialize'. For user customizations of -which packages to load/activate, see `package-load-list'.") +Each element has the form (PKG . DESC), where PKG is a package +name (a symbol) and DESC is a vector that describes the package. + +The vector DESC has the form [VERSION REQS DOCSTRING]. + VERSION is a version list. + REQS is a list of packages (symbols) required by the package. + DOCSTRING is a brief description of the package. + +This variable is set automatically by `package-load-descriptor', +called via `package-initialize'. To change which packages are +loaded and/or activated, customize `package-load-list'.") (put 'package-archive-contents 'risky-local-variable t) -(defvar package-activated-list - (mapcar #'car package-alist) +(defvar package-activated-list nil "List of the names of currently activated packages.") (put 'package-activated-list 'risky-local-variable t) @@ -673,7 +662,19 @@ (version-list-<= min-version (package-desc-vers (cdr pkg-desc)))))) -(defun package-compute-transaction (result requirements) +(defun package-compute-transaction (package-list requirements) + "Return a list of packages to be installed, including PACKAGE-LIST. +PACKAGE-LIST should be a list of package names (symbols). + +REQUIREMENTS should be a list of additional requirements; each +element in this list should have the form (PACKAGE VERSION), +where PACKAGE is a package name and VERSION is the required +version of that package (as a list). + +This function recursively computes the requirements of the +packages in REQUIREMENTS, and returns a list of all the packages +that must be installed. Packages that are already installed are +not included in this list." (dolist (elt requirements) (let* ((next-pkg (car elt)) (next-version (cadr elt))) @@ -704,13 +705,13 @@ (symbol-name next-pkg) (package-version-join next-version) (package-version-join (package-desc-vers (cdr pkg-desc))))) ;; Only add to the transaction if we don't already have it. - (unless (memq next-pkg result) - (setq result (cons next-pkg result))) - (setq result - (package-compute-transaction result + (unless (memq next-pkg package-list) + (setq package-list (cons next-pkg package-list))) + (setq package-list + (package-compute-transaction package-list (package-desc-reqs (cdr pkg-desc)))))))) - result) + package-list) (defun package-read-from-string (str) "Read a Lisp expression from STR. @@ -744,22 +745,10 @@ (cdr contents)))))) (defun package-read-all-archive-contents () - "Re-read `archive-contents' and `builtin-packages', if they exist. -Set `package-archive-contents' and `package--builtins' if successful. -Throw an error if the archive version is too new." + "Re-read `archive-contents', if it exists. +If successful, set `package-archive-contents'." (dolist (archive package-archives) - (package-read-archive-contents (car archive))) - (let ((builtins (package--read-archive-file "builtin-packages"))) - (if builtins - ;; Version 1 of 'builtin-packages' is a list where the car is - ;; a split emacs version and the cdr is an alist suitable for - ;; package--builtins. - (let ((our-version (version-to-list emacs-version)) - (result package--builtins-base)) - (setq package--builtins - (dolist (elt builtins result) - (if (version-list-<= (car elt) our-version) - (setq result (append (cdr elt) result))))))))) + (package-read-archive-contents (car archive)))) (defun package-read-archive-contents (archive) "Re-read `archive-contents' and `builtin-packages' for ARCHIVE. @@ -787,9 +776,13 @@ (version-list-< (aref existing-package 0) version)) (add-to-list 'package-archive-contents entry)))) -(defun package-download-transaction (transaction) - "Download and install all the packages in the given transaction." - (dolist (elt transaction) +(defun package-download-transaction (package-list) + "Download and install all the packages in PACKAGE-LIST. +PACKAGE-LIST should be a list of package names (symbols). +This function assumes that all package requirements in +PACKAGE-LIST are satisfied, i.e. that PACKAGE-LIST is computed +using `package-compute-transaction'." + (dolist (elt package-list) (let* ((desc (cdr (assq elt package-archive-contents))) ;; As an exception, if package is "held" in ;; `package-load-list', download the held version. @@ -1028,6 +1021,9 @@ "Load Emacs Lisp packages, and activate them. The variable `package-load-list' controls which packages to load." (interactive) + (require 'finder-inf nil t) + (setq package-alist package--builtins) + (setq package-activated-list (mapcar #'car package-alist)) (setq package-obsolete-alist nil) (package-load-all-descriptors) (package-read-all-archive-contents) @@ -1066,6 +1062,7 @@ (describe-package-1 package))))) (defun describe-package-1 (package) + (require 'lisp-mnt) (let ((package-name (symbol-name package)) (built-in (assq package package--builtins)) desc pkg-dir reqs version installable) @@ -1088,9 +1085,10 @@ installable t) (insert "an uninstalled package.\n\n")) - (insert " " (propertize "Status" 'face 'bold) ": ") + (insert " " (propertize "Status" 'font-lock-face 'bold) ": ") (cond (pkg-dir - (insert (propertize "Installed" 'face 'font-lock-comment-face)) + (insert (propertize "Installed" + 'font-lock-face 'font-lock-comment-face)) (insert " in `") ;; Todo: Add button for uninstalling. (help-insert-xref-button (file-name-as-directory pkg-dir) @@ -1112,14 +1110,17 @@ 'package-symbol package 'action 'package-install-button-action))) (built-in - (insert (propertize "Built-in" 'face 'font-lock-builtin-face) ".")) + (insert (propertize "Built-in" + 'font-lock-face 'font-lock-builtin-face) ".")) (t (insert "Deleted."))) (insert "\n") - (when version - (insert " " (propertize "Version" 'face 'bold) ": " version "\n")) + (and version + (> (length version) 0) + (insert " " + (propertize "Version" 'font-lock-face 'bold) ": " version "\n")) (setq reqs (package-desc-reqs desc)) (when reqs - (insert " " (propertize "Requires" 'face 'bold) ": ") + (insert " " (propertize "Requires" 'font-lock-face 'bold) ": ") (let ((first t) name vers text) (dolist (req reqs) @@ -1134,38 +1135,46 @@ (t (insert ", "))) (help-insert-xref-button text 'help-package name)) (insert "\n"))) - (insert " " (propertize "Summary" 'face 'bold) + (insert " " (propertize "Summary" 'font-lock-face 'bold) ": " (package-desc-doc desc) "\n\n") - ;; Insert the package commentary. - ;; FIXME: We should try to be smarter about when to download. - (let ((readme (expand-file-name (concat package-name "-readme.txt") - package-user-dir))) - ;; Try downloading the commentary. If that fails, try an - ;; existing readme file in `package-user-dir'. - (cond ((let ((buffer - (condition-case nil - (url-retrieve-synchronously - (concat (package-archive-url package) - package-name "-readme.txt")) - (error nil))) - response) - (when buffer - (with-current-buffer buffer - (setq response (url-http-parse-response)) - (if (or (< response 200) (>= response 300)) - (setq response nil) - (setq buffer-file-name - (expand-file-name readme package-user-dir)) - (delete-region (point-min) (1+ url-http-end-of-headers)) - (save-buffer))) - (when response - (insert-buffer-substring buffer) - (kill-buffer buffer) - t)))) - ((file-readable-p readme) - (insert-file-contents readme) - (goto-char (point-max))))))) + (if (assq package package--builtins) + ;; For built-in packages, insert the commentary. + (let ((fn (locate-file (concat package-name ".el") load-path + load-file-rep-suffixes)) + (opoint (point))) + (insert (or (lm-commentary fn) "")) + (save-excursion + (goto-char opoint) + (when (re-search-forward "^;;; Commentary:\n" nil t) + (replace-match "")) + (while (re-search-forward "^\\(;+ ?\\)" nil t) + (replace-match "")))) + (let ((readme (expand-file-name (concat package-name "-readme.txt") + package-user-dir))) + ;; For elpa packages, try downloading the commentary. If that + ;; fails, try an existing readme file in `package-user-dir'. + (cond ((let ((buffer (ignore-errors + (url-retrieve-synchronously + (concat (package-archive-url package) + package-name "-readme.txt")))) + response) + (when buffer + (with-current-buffer buffer + (setq response (url-http-parse-response)) + (if (or (< response 200) (>= response 300)) + (setq response nil) + (setq buffer-file-name + (expand-file-name readme package-user-dir)) + (delete-region (point-min) (1+ url-http-end-of-headers)) + (save-buffer))) + (when response + (insert-buffer-substring buffer) + (kill-buffer buffer) + t)))) + ((file-readable-p readme) + (insert-file-contents readme) + (goto-char (point-max)))))))) (defun package-install-button-action (button) (let ((package (button-get button 'package-symbol))) @@ -1195,6 +1204,8 @@ (define-key map "x" 'package-menu-execute) (define-key map "h" 'package-menu-quick-help) (define-key map "?" 'package-menu-describe-package) + (define-key map [follow-link] 'mouse-face) + (define-key map [mouse-2] 'mouse-select-window) (define-key map [menu-bar package-menu] (cons "Package" menu-map)) (define-key menu-map [mq] '(menu-item "Quit" quit-window @@ -1246,6 +1257,7 @@ (defvar package-menu-sort-button-map (let ((map (make-sparse-keymap))) (define-key map [header-line mouse-1] 'package-menu-sort-by-column) + (define-key map [header-line mouse-2] 'package-menu-sort-by-column) (define-key map [follow-link] 'mouse-face) map) "Local keymap for package menu sort buttons.") @@ -1276,12 +1288,12 @@ available for download." (interactive) (package-refresh-contents) - (package-list-packages-internal)) + (package--generate-package-list)) (defun package-menu-revert () "Update the list of packages." (interactive) - (package-list-packages-internal)) + (package--generate-package-list)) (defun package-menu-describe-package () "Describe the package in the current line." @@ -1429,7 +1441,7 @@ ;; This decides how we should sort; nil means by package name. (defvar package-menu-sort-key nil) -(defun package-list-packages-internal () +(defun package--generate-package-list (&optional packages) (package-initialize) ; FIXME: do this here? (with-current-buffer (get-buffer-create "*Packages*") (setq buffer-read-only nil) @@ -1439,34 +1451,35 @@ builtin) ;; List installed packages (dolist (elt package-alist) - ;; Ignore the Emacs package. - (setq name (car elt) - desc (cdr elt) - hold (assq name package-load-list)) - (unless (memq name '(emacs package)) + (setq name (car elt)) + (when (and (not (eq name 'emacs)) ; Hide the `emacs' package. + (or (null packages) + (memq name packages))) + (setq desc (cdr elt) + hold (cadr (assq name package-load-list)) + builtin (cdr (assq name package--builtins))) (setq info-list (package-list-maybe-add name (package-desc-vers desc) ;; FIXME: it turns out to be tricky to see if this ;; package is presently activated. - (cond ((stringp (cadr hold)) - "held") - ((and (setq builtin (assq name package--builtins)) + (cond ((stringp hold) "held") + ((and builtin (version-list-= - (package-desc-vers (cdr builtin)) + (package-desc-vers builtin) (package-desc-vers desc))) "built-in") (t "installed")) (package-desc-doc desc) info-list)))) - ;; List available packages + + ;; List available and disabled packages (dolist (elt package-archive-contents) (setq name (car elt) desc (cdr elt) hold (assq name package-load-list)) - (unless (and hold (stringp (cadr hold)) - (package-installed-p - name (version-to-list (cadr hold)))) + (when (or (null packages) + (memq name packages)) (setq info-list (package-list-maybe-add name (package-desc-vers desc) @@ -1488,47 +1501,80 @@ info-list))) (cdr elt))) package-obsolete-alist) - (let ((selector (cond - ((string= package-menu-sort-key "Version") - ;; FIXME this doesn't work. - #'(lambda (e) (cdr (car e)))) - ((string= package-menu-sort-key "Status") - #'(lambda (e) (car (cdr e)))) - ((string= package-menu-sort-key "Description") - #'(lambda (e) (car (cdr (cdr e))))) - (t ; "Package" is default. - #'(lambda (e) (symbol-name (car (car e)))))))) - (setq info-list - (sort info-list - (lambda (left right) - (let ((vleft (funcall selector left)) - (vright (funcall selector right))) - (string< vleft vright)))))) - (mapc (lambda (elt) - (package-print-package (car (car elt)) - (cdr (car elt)) - (car (cdr elt)) - (car (cdr (cdr elt))))) - info-list)) + + (setq info-list + (sort info-list + (cond ((string= package-menu-sort-key "Version") + 'package-menu--version-predicate) + ((string= package-menu-sort-key "Status") + 'package-menu--status-predicate) + ((string= package-menu-sort-key "Description") + 'package-menu--description-predicate) + (t ; Sort by package name by default + 'package-menu--name-predicate)))) + + (dolist (elt info-list) + (package-print-package (car (car elt)) + (cdr (car elt)) + (car (cdr elt)) + (car (cdr (cdr elt)))))) (goto-char (point-min)) + (set-buffer-modified-p nil) (current-buffer))) +(defun package-menu--version-predicate (left right) + (let ((vleft (cdr (car left))) + (vright (cdr (car right)))) + (if (version-list-= vleft right) + (package-menu--name-predicate left right) + (version-list-< left right)))) + +(defun package-menu--status-predicate (left right) + (let ((sleft (cadr left)) + (sright (cadr right))) + (cond ((string= sleft sright) + (package-menu--name-predicate left right)) + ((string= sleft "available") t) + ((string= sright "available") nil) + ((string= sleft "installed") t) + ((string= sright "installed") nil) + ((string= sleft "held") t) + ((string= sright "held") nil) + ((string= sleft "built-in") t) + ((string= sright "built-in") nil) + ((string= sleft "obsolete") t) + ((string= sright "obsolete") nil) + (t (string< sleft sright))))) + +(defun package-menu--description-predicate (left right) + (let ((sleft (car (cddr left))) + (sright (car (cddr right)))) + (if (string= sleft sright) + (package-menu--name-predicate left right) + (string< sleft sright)))) + +(defun package-menu--name-predicate (left right) + (string< (symbol-name (caar left)) + (symbol-name (caar right)))) + (defun package-menu-sort-by-column (&optional e) "Sort the package menu by the last column clicked on." - (interactive (list last-input-event)) + (interactive "e") (if e (mouse-select-window e)) (let* ((pos (event-start e)) - (obj (posn-object pos)) - (col (if obj - (get-text-property (cdr obj) 'column-name (car obj)) - (get-text-property (posn-point pos) 'column-name)))) - (setq package-menu-sort-key col)) - (package-list-packages-internal)) + (obj (posn-object pos)) + (col (if obj + (get-text-property (cdr obj) 'column-name (car obj)) + (get-text-property (posn-point pos) 'column-name))) + (inhibit-read-only t)) + (setq package-menu-sort-key col) + (package--generate-package-list))) -(defun package--list-packages () - "Display a list of packages. -Helper function that does all the work for the user-facing functions." - (with-current-buffer (package-list-packages-internal) +(defun package--list-packages (&optional packages) + "Display the properties of PACKAGES. +PACKAGES should be a list of package names (symbols). +If PACKAGES is nil, display all packages in `package-alist'." + (with-current-buffer (package--generate-package-list packages) (package-menu-mode) ;; Set up the header line. (setq header-line-format @@ -1560,22 +1606,22 @@ "")) ;; It's okay to use pop-to-buffer here. The package menu buffer - ;; has keybindings, and the user just typed 'M-x - ;; package-list-packages', suggesting that they might want to use - ;; them. + ;; has keybindings, and the user just typed `M-x list-packages', + ;; suggesting that they might want to use them. (pop-to-buffer (current-buffer)))) ;;;###autoload -(defun package-list-packages () +(defun list-packages () "Display a list of packages. Fetches the updated list of packages before displaying. The list is displayed in a buffer named `*Packages*'." (interactive) (package-refresh-contents) + (setq package-menu-sort-key "Status") (package--list-packages)) ;;;###autoload -(defalias 'list-packages 'package-list-packages) +(defalias 'package-list-packages 'list-packages) (defun package-list-packages-no-fetch () "Display a list of packages. === modified file 'lisp/finder.el' --- lisp/finder.el 2010-06-11 19:09:57 +0000 +++ lisp/finder.el 2010-08-29 22:15:09 +0000 @@ -30,6 +30,7 @@ ;;; Code: +(require 'package) (require 'lisp-mnt) (require 'find-func) ;for find-library(-suffixes) ;; Use `load' rather than `require' so that it doesn't get loaded @@ -39,46 +40,42 @@ ;; These are supposed to correspond to top-level customization groups, ;; says rms. (defvar finder-known-keywords - '( - (abbrev . "abbreviation handling, typing shortcuts, macros") - ;; Too specific: - (bib . "code related to the `bib' bibliography processor") - (c . "support for the C language and related languages") - (calendar . "calendar and time management support") - (comm . "communications, networking, remote access to files") + '((abbrev . "abbreviation handling, typing shortcuts, and macros") + (bib . "bibliography processors") + (c . "C and related programming languages") + (calendar . "calendar and time management tools") + (comm . "communications, networking, and remote file access") (convenience . "convenience features for faster editing") - (data . "support for editing files of data") - (docs . "support for Emacs documentation") + (data . "editing data (non-text) files") + (docs . "Emacs documentation facilities") (emulations . "emulations of other editors") (extensions . "Emacs Lisp language extensions") - (faces . "support for multiple fonts") - (files . "support for editing and manipulating files") - (frames . "support for Emacs frames and window systems") + (faces . "fonts and colors for text") + (files . "file editing and manipulation") + (frames . "Emacs frames and window systems") (games . "games, jokes and amusements") - (hardware . "support for interfacing with exotic hardware") - (help . "support for on-line help systems") - (hypermedia . "support for links between text or other media types") - (i18n . "internationalization and alternate character-set support") + (hardware . "interfacing with system hardware") + (help . "on-line help systems") + (hypermedia . "links between text or other media types") + (i18n . "internationalization and character-set support") (internal . "code for Emacs internals, build process, defaults") (languages . "specialized modes for editing programming languages") (lisp . "Lisp support, including Emacs Lisp") (local . "code local to your site") - (maint . "maintenance aids for the Emacs development group") - (mail . "modes for electronic-mail handling") - (matching . "various sorts of searching and matching") + (maint . "Emacs development tools and aids") + (mail . "email reading and posting") + (matching . "searching, matching, and sorting") (mouse . "mouse support") - (multimedia . "images and sound support") - (news . "support for netnews reading and posting") - (oop . "support for object-oriented programming") - (outlines . "support for hierarchical outlining") - (processes . "process, subshell, compilation, and job control support") - (terminals . "support for terminal types") - (tex . "supporting code for the TeX formatter") + (multimedia . "images and sound") + (news . "USENET news reading and posting") + (outlines . "hierarchical outlining and note taking") + (processes . "processes, subshells, and compilation") + (terminals . "text terminals (ttys)") + (tex . "the TeX document formatter") (tools . "programming tools") - (unix . "front-ends/assistants for, or emulators of, UNIX-like features") + (unix . "UNIX feature interfaces and emulators") (vc . "version control") - (wp . "word processing") - )) + (wp . "word processing"))) (defvar finder-mode-map (let ((map (make-sparse-keymap)) @@ -125,8 +122,9 @@ ;;; Code for regenerating the keyword list. -(defvar finder-package-info nil - "Assoc list mapping file names to description & keyword lists.") +(defvar finder-keywords-hash nil + "Hash table mapping keywords to lists of package names. +Keywords and package names both should be symbols.") (defvar generated-finder-keywords-file "finder-inf.el" "The function `finder-compile-keywords' writes keywords into this file.") @@ -142,10 +140,91 @@ (autoload 'autoload-rubric "autoload") +(defvar finder--builtins-alist + '(("calc" . calc) + ("ede" . ede) + ("erc" . erc) + ("eshell" . eshell) + ("gnus" . gnus) + ("international" . emacs) + ("language" . emacs) + ("mh-e" . mh-e) + ("semantic" . semantic) + ("analyze" . semantic) + ("bovine" . semantic) + ("decorate" . semantic) + ("symref" . semantic) + ("wisent" . semantic) + ("nxml" . nxml) + ("org" . org) + ("srecode" . srecode) + ("term" . emacs) + ("url" . url)) + "Alist of built-in package directories. +Each element should have the form (DIR . PACKAGE), where DIR is a +directory name and PACKAGE is the name of a package (a symbol). +When generating `package--builtins', Emacs assumes any file in +DIR is part of the package PACKAGE.") + (defun finder-compile-keywords (&rest dirs) - "Regenerate the keywords association list into `generated-finder-keywords-file'. -Optional arguments DIRS are a list of Emacs Lisp directories to compile from; -no arguments compiles from `load-path'." + "Regenerate list of built-in Emacs packages. +This recomputes `package--builtins' and `finder-keywords-hash', +and prints them into the file `generated-finder-keywords-file'. + +Optional DIRS is a list of Emacs Lisp directories to compile +from; the default is `load-path'." + ;; Allow compressed files also. + (setq package--builtins nil) + (setq finder-keywords-hash (make-hash-table :test 'eq)) + (let ((el-file-regexp "^\\([^=].*\\)\\.el\\(\\.\\(gz\\|Z\\)\\)?$") + package-override files base-name processed + summary keywords package version entry desc) + (dolist (d (or dirs load-path)) + (when (file-exists-p (directory-file-name d)) + (message "Directory %s" d) + (setq package-override + (intern-soft + (cdr-safe + (assoc (file-name-nondirectory (directory-file-name d)) + finder--builtins-alist)))) + (setq files (directory-files d nil el-file-regexp)) + (dolist (f files) + (unless (or (string-match finder-no-scan-regexp f) + (null (setq base-name + (and (string-match el-file-regexp f) + (intern (match-string 1 f))))) + (memq base-name processed)) + (push base-name processed) + (with-temp-buffer + (insert-file-contents (expand-file-name f d)) + (setq summary (lm-synopsis) + keywords (mapcar 'intern (lm-keywords-list)) + package (or package-override + (intern-soft (lm-header "package")) + base-name) + version (lm-header "version"))) + (when summary + (setq version (ignore-errors (version-to-list version))) + (setq entry (assq package package--builtins)) + (cond ((null entry) + (push (cons package (vector version nil summary)) + package--builtins)) + ((eq base-name package) + (setq desc (cdr entry)) + (aset desc 0 version) + (aset desc 2 summary))) + (dolist (kw keywords) + (puthash kw + (cons package + (delq package + (gethash kw finder-keywords-hash))) + finder-keywords-hash)))))))) + + (setq package--builtins + (sort package--builtins + (lambda (a b) (string< (symbol-name (car a)) + (symbol-name (car b)))))) + (save-excursion (find-file generated-finder-keywords-file) (setq buffer-undo-list t) @@ -153,40 +232,23 @@ (insert (autoload-rubric generated-finder-keywords-file "keyword-to-package mapping" t)) (search-backward " ") - (insert "(setq finder-package-info '(\n") - (let (processed summary keywords) - (mapc - (lambda (d) - (when (file-exists-p (directory-file-name d)) - (message "Directory %s" d) - (mapc - (lambda (f) - ;; FIXME should this not be using (expand-file-name f d)? - (unless (or (member f processed) - (string-match finder-no-scan-regexp f)) - (setq processed (cons f processed)) - (with-temp-buffer - (insert-file-contents (expand-file-name f d)) - (setq summary (lm-synopsis) - keywords (lm-keywords-list))) - (insert - (format " (\"%s\"\n " - (if (string-match "\\.\\(gz\\|Z\\)$" f) - (file-name-sans-extension f) - f))) - (prin1 summary (current-buffer)) - (insert "\n ") - (prin1 (mapcar 'intern keywords) (current-buffer)) - (insert ")\n"))) - (directory-files d nil - ;; Allow compressed files also. FIXME: - ;; generalize this, especially for - ;; MS-DOG-type filenames. - "^[^=].*\\.el\\(\\.\\(gz\\|Z\\)\\)?$" - )))) - (or dirs load-path))) - (insert " ))\n") - (eval-buffer) ; so we get the new keyword list immediately + (insert "(setq package--builtins '(\n") + (dolist (package package--builtins) + (insert " (") + (prin1 (car package) (current-buffer)) + (insert " .\n [") + (let ((desc (cdr package))) + (prin1 (aref desc 0) (current-buffer)) + (insert " ") + (prin1 (aref desc 1) (current-buffer)) + (insert " ") + (prin1 (aref desc 2) (current-buffer))) + (insert "])\n")) + (insert " ))\n\n") + ;; Insert hash table. + (insert "(setq finder-keywords-hash\n ") + (prin1 finder-keywords-hash (current-buffer)) + (insert ")\n") (basic-save-buffer))) (defun finder-compile-keywords-make-dist () @@ -226,26 +288,14 @@ (defun finder-unknown-keywords () "Return an alist of unknown keywords and number of their occurences. -Unknown are keywords that are present in `finder-package-info' -but absent in `finder-known-keywords'." - (let ((unknown-keywords-hash (make-hash-table))) - ;; Prepare a hash where key is a keyword - ;; and value is the number of keyword occurences. - (mapc (lambda (package) - (mapc (lambda (keyword) - (unless (assq keyword finder-known-keywords) - (puthash keyword - (1+ (gethash keyword unknown-keywords-hash 0)) - unknown-keywords-hash))) - (nth 2 package))) - finder-package-info) - ;; Make an alist from the hash and sort by the keyword name. - (sort (let (unknown-keywords-list) - (maphash (lambda (key value) - (push (cons key value) unknown-keywords-list)) - unknown-keywords-hash) - unknown-keywords-list) - (lambda (a b) (string< (car a) (car b)))))) +Unknown keywords are those present in `finder-keywords-hash' but +not `finder-known-keywords'." + (let (alist) + (maphash (lambda (kw packages) + (unless (assq kw finder-known-keywords) + (push (cons kw (length packages)) alist))) + finder-keywords-hash) + (sort alist (lambda (a b) (string< (car a) (car b)))))) ;;;###autoload (defun finder-list-keywords () @@ -255,46 +305,28 @@ (pop-to-buffer "*Finder*") (pop-to-buffer (get-buffer-create "*Finder*")) (finder-mode) - (setq buffer-read-only nil - buffer-undo-list t) - (erase-buffer) - (mapc - (lambda (assoc) - (let ((keyword (car assoc))) - (insert (symbol-name keyword)) - (finder-insert-at-column 14 (concat (cdr assoc) "\n")) - (finder-mouse-face-on-line))) - finder-known-keywords) - (goto-char (point-min)) - (setq finder-headmark (point) - buffer-read-only t) - (set-buffer-modified-p nil) - (balance-windows) - (finder-summary))) + (let ((inhibit-read-only t)) + (erase-buffer) + (dolist (assoc finder-known-keywords) + (let ((keyword (car assoc))) + (insert (propertize (symbol-name keyword) + 'font-lock-face 'font-lock-constant-face)) + (finder-insert-at-column 14 (concat (cdr assoc) "\n")) + (finder-mouse-face-on-line))) + (goto-char (point-min)) + (setq finder-headmark (point) + buffer-read-only t) + (set-buffer-modified-p nil) + (balance-windows) + (finder-summary)))) (defun finder-list-matches (key) - (pop-to-buffer (set-buffer (get-buffer-create "*Finder Category*"))) - (finder-mode) - (setq buffer-read-only nil - buffer-undo-list t) - (erase-buffer) - (let ((id (intern key))) - (insert - "The following packages match the keyword `" key "':\n\n") - (setq finder-headmark (point)) - (mapc - (lambda (x) - (when (memq id (cadr (cdr x))) - (insert (car x)) - (finder-insert-at-column 16 (concat (cadr x) "\n")) - (finder-mouse-face-on-line))) - finder-package-info) - (goto-char (point-min)) - (forward-line) - (setq buffer-read-only t) - (set-buffer-modified-p nil) - (shrink-window-if-larger-than-buffer) - (finder-summary))) + (let* ((id (intern key)) + (packages (gethash id finder-keywords-hash))) + (unless packages + (error "No packages matching key `%s'" key)) + (setq package-menu-sort-key nil) + (package--list-packages packages))) (define-button-type 'finder-xref 'action #'finder-goto-xref) @@ -381,8 +413,8 @@ \\[finder-select] more help for the item on the current line \\[finder-exit] exit Finder mode and kill the Finder buffer." :syntax-table finder-mode-syntax-table - (setq font-lock-defaults '(finder-font-lock-keywords nil nil - (("+-*/.<>=!?$%_&~^:@" . "w")) nil)) + (setq buffer-read-only t + buffer-undo-list t) (set (make-local-variable 'finder-headmark) nil)) (defun finder-summary () @@ -399,8 +431,8 @@ Delete the window and kill all Finder-related buffers." (interactive) (ignore-errors (delete-window)) - (dolist (buff '("*Finder*" "*Finder-package*" "*Finder Category*")) - (and (get-buffer buff) (kill-buffer buff)))) + (let ((buf "*Finder*")) + (and (get-buffer buf) (kill-buffer buf)))) (provide 'finder) === modified file 'lisp/ibuffer.el' --- lisp/ibuffer.el 2010-05-03 22:42:19 +0000 +++ lisp/ibuffer.el 2010-08-29 22:15:09 +0000 @@ -2641,7 +2641,7 @@ ;;;;;; ibuffer-backward-filter-group ibuffer-forward-filter-group ;;;;;; ibuffer-toggle-filter-group ibuffer-mouse-toggle-filter-group ;;;;;; ibuffer-interactive-filter-by-mode ibuffer-mouse-filter-by-mode -;;;;;; ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" "e1272bfdc7c3b6e926b2a68155217303") +;;;;;; ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" "fa9822b5ef905f06d8a03dc9ce3a2894") ;;; Generated autoloads from ibuf-ext.el (autoload 'ibuffer-auto-mode "ibuf-ext" "\ === modified file 'lisp/info.el' --- lisp/info.el 2010-07-14 15:57:54 +0000 +++ lisp/info.el 2010-08-29 22:15:09 +0000 @@ -3372,7 +3372,6 @@ filename) (defvar finder-known-keywords) -(defvar finder-package-info) (declare-function find-library-name "find-func" (library)) (declare-function finder-unknown-keywords "finder" ()) (declare-function lm-commentary "lisp-mnt" (&optional file)) @@ -3388,15 +3387,14 @@ (insert "Finder Keywords\n") (insert "***************\n\n") (insert "* Menu:\n\n") - (mapc - (lambda (assoc) - (let ((keyword (car assoc))) - (insert (format "* %-14s %s.\n" - (concat (symbol-name keyword) "::") - (cdr assoc))))) - (append '((all . "All package info") - (unknown . "unknown keywords")) - finder-known-keywords))) + (dolist (assoc (append '((all . "All package info") + (unknown . "unknown keywords")) + finder-known-keywords)) + (let ((keyword (car assoc))) + (insert (format "* %s %s.\n" + (concat (symbol-name keyword) ": " + "kw:" (symbol-name keyword) ".") + (cdr assoc)))))) ((equal nodename "unknown") ;; Display unknown keywords (insert (format "\n\^_\nFile: %s, Node: %s, Up: Top\n\n" @@ -3416,17 +3414,36 @@ Info-finder-file nodename)) (insert "Finder Package Info\n") (insert "*******************\n\n") - (mapc (lambda (package) - (insert (format "%s - %s\n" - (format "*Note %s::" (nth 0 package)) - (nth 1 package))) - (insert "Keywords: " - (mapconcat (lambda (keyword) - (format "*Note %s::" (symbol-name keyword))) - (nth 2 package) ", ") - "\n\n")) - finder-package-info)) - ((string-match-p "\\.el\\'" nodename) + (dolist (package package-alist) + (insert (format "%s - %s\n" + (format "*Note %s::" (nth 0 package)) + (nth 1 package))))) + ((string-match "\\`kw:" nodename) + (setq nodename (substring nodename (match-end 0))) + ;; Display packages that match the keyword + ;; or the list of keywords separated by comma. + (insert (format "\n\^_\nFile: %s, Node: kw:%s, Up: Top\n\n" + Info-finder-file nodename)) + (insert "Finder Packages\n") + (insert "***************\n\n") + (insert + "The following packages match the keyword `" nodename "':\n\n") + (insert "* Menu:\n\n") + (let ((keywords + (mapcar 'intern (if (string-match-p "," nodename) + (split-string nodename ",[ \t\n]*" t) + (list nodename)))) + hits desc) + (dolist (kw keywords) + (push (copy-tree (gethash kw finder-keywords-hash)) hits)) + (setq hits (delete-dups (apply 'append hits))) + (dolist (package hits) + (setq desc (cdr-safe (assq package package-alist))) + (when (vectorp desc) + (insert (format "* %-16s %s.\n" + (concat (symbol-name package) "::") + (aref desc 2))))))) + (t ;; Display commentary section (insert (format "\n\^_\nFile: %s, Node: %s, Up: Top\n\n" Info-finder-file nodename)) @@ -3447,29 +3464,7 @@ (goto-char (point-min)) (while (re-search-forward "^;+ ?" nil t) (replace-match "" nil nil)) - (buffer-string)))))) - (t - ;; Display packages that match the keyword - ;; or the list of keywords separated by comma. - (insert (format "\n\^_\nFile: %s, Node: %s, Up: Top\n\n" - Info-finder-file nodename)) - (insert "Finder Packages\n") - (insert "***************\n\n") - (insert - "The following packages match the keyword `" nodename "':\n\n") - (insert "* Menu:\n\n") - (let ((keywords - (mapcar 'intern (if (string-match-p "," nodename) - (split-string nodename ",[ \t\n]*" t) - (list nodename))))) - (mapc - (lambda (package) - (unless (memq nil (mapcar (lambda (k) (memq k (nth 2 package))) - keywords)) - (insert (format "* %-16s %s.\n" - (concat (nth 0 package) "::") - (nth 1 package))))) - finder-package-info))))) + (buffer-string)))))))) ;;;###autoload (defun info-finder (&optional keywords) ------------------------------------------------------------ revno: 101206 committer: Chong Yidong branch nick: trunk timestamp: Sun 2010-08-29 16:10:43 -0400 message: Add "Version:" and "Package:" Lisp file headers. diff: === modified file 'lisp/abbrevlist.el' --- lisp/abbrevlist.el 2010-01-13 08:35:10 +0000 +++ lisp/abbrevlist.el 2010-08-29 20:10:43 +0000 @@ -6,6 +6,7 @@ ;; Maintainer: FSF ;; Keywords: abbrev +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/apropos.el' --- lisp/apropos.el 2010-01-13 08:35:10 +0000 +++ lisp/apropos.el 2010-08-29 20:10:43 +0000 @@ -6,6 +6,7 @@ ;; Author: Joe Wells ;; Daniel Pfeiffer (rewrite) ;; Keywords: help +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/icalendar.el' --- lisp/calendar/icalendar.el 2010-08-17 06:48:37 +0000 +++ lisp/calendar/icalendar.el 2010-08-29 20:10:43 +0000 @@ -7,6 +7,7 @@ ;; Created: August 2002 ;; Keywords: calendar ;; Human-Keywords: calendar, diary, iCalendar, vCalendar +;; Version: 0.19 ;; This file is part of GNU Emacs. === modified file 'lisp/cedet/cedet.el' --- lisp/cedet/cedet.el 2010-01-13 08:35:10 +0000 +++ lisp/cedet/cedet.el 2010-08-29 20:10:43 +0000 @@ -5,7 +5,7 @@ ;; Author: David Ponce ;; Maintainer: Eric M. Ludlam -;; Version: 0.2 +;; Version: 1.0pre7 ;; Keywords: OO, lisp ;; This file is part of GNU Emacs. === modified file 'lisp/cedet/ede.el' --- lisp/cedet/ede.el 2010-02-16 14:35:45 +0000 +++ lisp/cedet/ede.el 2010-08-29 20:10:43 +0000 @@ -5,6 +5,7 @@ ;; Author: Eric M. Ludlam ;; Keywords: project, make +;; Version: 1.0pre7 ;; This file is part of GNU Emacs. === modified file 'lisp/cedet/semantic.el' --- lisp/cedet/semantic.el 2010-08-29 16:17:13 +0000 +++ lisp/cedet/semantic.el 2010-08-29 20:10:43 +0000 @@ -5,6 +5,7 @@ ;; Author: Eric M. Ludlam ;; Keywords: syntax tools +;; Version: 2.0pre7 ;; This file is part of GNU Emacs. === modified file 'lisp/cedet/srecode.el' --- lisp/cedet/srecode.el 2010-02-16 14:35:45 +0000 +++ lisp/cedet/srecode.el 2010-08-29 20:10:43 +0000 @@ -4,6 +4,7 @@ ;; Author: Eric M. Ludlam ;; Keywords: codegeneration +;; Version: 1.0pre7 ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/authors.el' --- lisp/emacs-lisp/authors.el 2010-08-05 17:11:32 +0000 +++ lisp/emacs-lisp/authors.el 2010-08-29 20:10:43 +0000 @@ -6,6 +6,7 @@ ;; Author: Gerd Moellmann ;; Maintainer: Kim F. Storm ;; Keywords: maint +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emulation/viper.el' --- lisp/emulation/viper.el 2010-01-13 08:35:10 +0000 +++ lisp/emulation/viper.el 2010-08-29 20:10:43 +0000 @@ -8,6 +8,7 @@ ;; Author: Michael Kifer ;; Keywords: emulations +;; Version: 3.14.1 ;; Yoni Rabkin contacted the maintainer of this ;; file on 20/3/2008, and the maintainer agreed that when a bug is === modified file 'lisp/epg.el' --- lisp/epg.el 2010-05-27 23:30:11 +0000 +++ lisp/epg.el 2010-08-29 20:10:43 +0000 @@ -4,6 +4,7 @@ ;; Author: Daiki Ueno ;; Keywords: PGP, GnuPG +;; Version: 1.0.0 ;; This file is part of GNU Emacs. === modified file 'lisp/erc/erc.el' --- lisp/erc/erc.el 2010-08-08 22:13:53 +0000 +++ lisp/erc/erc.el 2010-08-29 20:10:43 +0000 @@ -12,6 +12,7 @@ ;; David Edmondson (dme@dme.org) ;; Maintainer: Michael Olson (mwolson@gnu.org) ;; Keywords: IRC, chat, client, Internet +;; Version: 5.3 ;; This file is part of GNU Emacs. === modified file 'lisp/generic-x.el' --- lisp/generic-x.el 2010-06-27 18:43:34 +0000 +++ lisp/generic-x.el 2010-08-29 20:10:43 +0000 @@ -6,6 +6,7 @@ ;; Author: Peter Breton ;; Created: Tue Oct 08 1996 ;; Keywords: generic, comment, font-lock +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/gnus/gnus.el' --- lisp/gnus/gnus.el 2010-01-13 08:35:10 +0000 +++ lisp/gnus/gnus.el 2010-08-29 20:10:43 +0000 @@ -7,6 +7,7 @@ ;; Author: Masanobu UMEDA ;; Lars Magne Ingebrigtsen ;; Keywords: news, mail +;; Version: 5.13 ;; This file is part of GNU Emacs. === modified file 'lisp/htmlfontify.el' --- lisp/htmlfontify.el 2010-07-10 18:52:53 +0000 +++ lisp/htmlfontify.el 2010-08-29 20:10:43 +0000 @@ -15,6 +15,7 @@ ;; Compatibility: Emacs23, Emacs22 ;; Incompatibility: Emacs19, Emacs20, Emacs21 ;; Last Updated: Thu 2009-11-19 01:31:21 +0000 +;; Version: 0.21 ;; This file is part of GNU Emacs. === modified file 'lisp/ibuf-ext.el' --- lisp/ibuf-ext.el 2010-05-03 02:29:46 +0000 +++ lisp/ibuf-ext.el 2010-08-29 20:10:43 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: John Paul Wallington ;; Created: 2 Dec 2001 ;; Keywords: buffer, convenience +;; Package: ibuffer ;; This file is part of GNU Emacs. === modified file 'lisp/ibuf-macs.el' --- lisp/ibuf-macs.el 2010-01-13 08:35:10 +0000 +++ lisp/ibuf-macs.el 2010-08-29 20:10:43 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: John Paul Wallington ;; Created: 6 Dec 2001 ;; Keywords: buffer, convenience +;; Package: ibuffer ;; This file is part of GNU Emacs. === modified file 'lisp/linum.el' --- lisp/linum.el 2010-01-13 08:35:10 +0000 +++ lisp/linum.el 2010-08-29 20:10:43 +0000 @@ -5,6 +5,7 @@ ;; Author: Markus Triska ;; Maintainer: FSF ;; Keywords: convenience +;; Version: 0.9x ;; This file is part of GNU Emacs. === modified file 'lisp/mail/rmail-spam-filter.el' --- lisp/mail/rmail-spam-filter.el 2010-06-03 15:34:35 +0000 +++ lisp/mail/rmail-spam-filter.el 2010-08-29 20:10:43 +0000 @@ -4,6 +4,7 @@ ;; Free Software Foundation, Inc. ;; Keywords: email, spam, filter, rmail ;; Author: Eli Tziperman +;; Package: rmail ;; This file is part of GNU Emacs. === modified file 'lisp/net/newsticker.el' --- lisp/net/newsticker.el 2010-01-13 08:35:10 +0000 +++ lisp/net/newsticker.el 2010-08-29 20:10:43 +0000 @@ -9,6 +9,7 @@ ;; Created: 17. June 2003 ;; Keywords: News, RSS, Atom ;; Time-stamp: "6. Dezember 2009, 19:15:18 (ulf)" +;; Version: 1.99 ;; ====================================================================== === modified file 'lisp/progmodes/idlw-complete-structtag.el' --- lisp/progmodes/idlw-complete-structtag.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/idlw-complete-structtag.el 2010-08-29 20:10:43 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: J.D. Smith ;; Version: 1.2 ;; Keywords: languages +;; Package: idlwave ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/idlw-help.el' --- lisp/progmodes/idlw-help.el 2010-08-29 16:17:13 +0000 +++ lisp/progmodes/idlw-help.el 2010-08-29 20:10:43 +0000 @@ -7,6 +7,7 @@ ;; Carsten Dominik ;; Maintainer: J.D. Smith ;; Version: 6.1.22 +;; Package: idlwave ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/idlw-shell.el' --- lisp/progmodes/idlw-shell.el 2010-08-29 16:17:13 +0000 +++ lisp/progmodes/idlw-shell.el 2010-08-29 20:10:43 +0000 @@ -9,6 +9,7 @@ ;; Maintainer: J.D. Smith ;; Version: 6.1.22 ;; Keywords: processes +;; Package: idlwave ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/idlw-toolbar.el' --- lisp/progmodes/idlw-toolbar.el 2010-08-29 16:17:13 +0000 +++ lisp/progmodes/idlw-toolbar.el 2010-08-29 20:10:43 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: J.D. Smith ;; Version: 6.1.22 ;; Keywords: processes +;; Package: idlwave ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/octave-inf.el' --- lisp/progmodes/octave-inf.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/octave-inf.el 2010-08-29 20:10:43 +0000 @@ -7,6 +7,7 @@ ;; Author: John Eaton ;; Maintainer: Kurt Hornik ;; Keywords: languages +;; Package: octave-mod ;; This file is part of GNU Emacs. === modified file 'lisp/vc/ediff.el' --- lisp/vc/ediff.el 2010-06-11 19:09:57 +0000 +++ lisp/vc/ediff.el 2010-08-29 20:10:43 +0000 @@ -6,6 +6,7 @@ ;; Author: Michael Kifer ;; Created: February 2, 1994 ;; Keywords: comparing, merging, patching, vc, tools, unix +;; Version: 2.81.4 ;; Yoni Rabkin contacted the maintainer of this ;; file on 20/3/2008, and the maintainer agreed that when a bug is ------------------------------------------------------------ revno: 101205 committer: Chong Yidong branch nick: trunk timestamp: Sun 2010-08-29 12:17:13 -0400 message: Add "Package:" file headers to denote built-in packages. diff: === modified file 'lisp/abbrev.el' --- lisp/abbrev.el 2010-04-26 09:55:29 +0000 +++ lisp/abbrev.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: abbrev convenience +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/bindings.el' --- lisp/bindings.el 2010-08-08 21:12:29 +0000 +++ lisp/bindings.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Maintainer: FSF ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/buff-menu.el' --- lisp/buff-menu.el 2010-01-13 08:35:10 +0000 +++ lisp/buff-menu.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: convenience +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/button.el' --- lisp/button.el 2010-01-13 08:35:10 +0000 +++ lisp/button.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; ;; Author: Miles Bader ;; Keywords: extensions +;; Package: emacs ;; ;; This file is part of GNU Emacs. ;; === modified file 'lisp/calendar/appt.el' --- lisp/calendar/appt.el 2010-06-15 03:42:33 +0000 +++ lisp/calendar/appt.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Neil Mager ;; Maintainer: Glenn Morris ;; Keywords: calendar +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/cal-bahai.el' --- lisp/calendar/cal-bahai.el 2010-01-13 08:35:10 +0000 +++ lisp/calendar/cal-bahai.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: John Wiegley ;; Keywords: calendar ;; Human-Keywords: Bahá'í calendar, Bahá'í, Baha'i, Bahai, calendar, diary +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/cal-china.el' --- lisp/calendar/cal-china.el 2010-01-13 08:35:10 +0000 +++ lisp/calendar/cal-china.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: Glenn Morris ;; Keywords: calendar ;; Human-Keywords: Chinese calendar, calendar, holidays, diary +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/cal-coptic.el' --- lisp/calendar/cal-coptic.el 2010-01-13 08:35:10 +0000 +++ lisp/calendar/cal-coptic.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: Glenn Morris ;; Keywords: calendar ;; Human-Keywords: Coptic calendar, Ethiopic calendar, calendar, diary +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/cal-dst.el' --- lisp/calendar/cal-dst.el 2010-01-13 08:35:10 +0000 +++ lisp/calendar/cal-dst.el 2010-08-29 16:17:13 +0000 @@ -8,6 +8,7 @@ ;; Maintainer: Glenn Morris ;; Keywords: calendar ;; Human-Keywords: daylight saving time, calendar, diary, holidays +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/cal-french.el' --- lisp/calendar/cal-french.el 2010-03-18 05:25:13 +0000 +++ lisp/calendar/cal-french.el 2010-08-29 16:17:13 +0000 @@ -8,6 +8,7 @@ ;; Maintainer: Glenn Morris ;; Keywords: calendar ;; Human-Keywords: French Revolutionary calendar, calendar, diary +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/cal-hebrew.el' --- lisp/calendar/cal-hebrew.el 2010-03-02 03:27:41 +0000 +++ lisp/calendar/cal-hebrew.el 2010-08-29 16:17:13 +0000 @@ -8,6 +8,7 @@ ;; Maintainer: Glenn Morris ;; Keywords: calendar ;; Human-Keywords: Hebrew calendar, calendar, diary +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/cal-html.el' --- lisp/calendar/cal-html.el 2010-01-13 08:35:10 +0000 +++ lisp/calendar/cal-html.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Keywords: calendar ;; Human-Keywords: calendar, diary, HTML ;; Created: 23 Aug 2002 +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/cal-islam.el' --- lisp/calendar/cal-islam.el 2010-01-13 08:35:10 +0000 +++ lisp/calendar/cal-islam.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: Glenn Morris ;; Keywords: calendar ;; Human-Keywords: Islamic calendar, calendar, diary +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/cal-iso.el' --- lisp/calendar/cal-iso.el 2010-01-13 08:35:10 +0000 +++ lisp/calendar/cal-iso.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: Glenn Morris ;; Keywords: calendar ;; Human-Keywords: ISO calendar, calendar, diary +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/cal-julian.el' --- lisp/calendar/cal-julian.el 2010-01-13 08:35:10 +0000 +++ lisp/calendar/cal-julian.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: Glenn Morris ;; Keywords: calendar ;; Human-Keywords: Julian calendar, Julian day number, calendar, diary +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/cal-mayan.el' --- lisp/calendar/cal-mayan.el 2010-01-13 08:35:10 +0000 +++ lisp/calendar/cal-mayan.el 2010-08-29 16:17:13 +0000 @@ -8,6 +8,7 @@ ;; Maintainer: Glenn Morris ;; Keywords: calendar ;; Human-Keywords: Mayan calendar, Maya, calendar, diary +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/cal-menu.el' --- lisp/calendar/cal-menu.el 2010-01-13 08:35:10 +0000 +++ lisp/calendar/cal-menu.el 2010-08-29 16:17:13 +0000 @@ -8,6 +8,7 @@ ;; Maintainer: Glenn Morris ;; Keywords: calendar ;; Human-Keywords: calendar, popup menus, menu bar +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/cal-move.el' --- lisp/calendar/cal-move.el 2010-01-13 08:35:10 +0000 +++ lisp/calendar/cal-move.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: Glenn Morris ;; Keywords: calendar ;; Human-Keywords: calendar +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/cal-persia.el' --- lisp/calendar/cal-persia.el 2010-01-13 08:35:10 +0000 +++ lisp/calendar/cal-persia.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: Glenn Morris ;; Keywords: calendar ;; Human-Keywords: Persian calendar, calendar, diary +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/cal-tex.el' --- lisp/calendar/cal-tex.el 2010-07-10 23:34:57 +0000 +++ lisp/calendar/cal-tex.el 2010-08-29 16:17:13 +0000 @@ -8,6 +8,7 @@ ;; Maintainer: Glenn Morris ;; Keywords: calendar ;; Human-Keywords: Calendar, LaTeX +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/cal-x.el' --- lisp/calendar/cal-x.el 2010-01-13 08:35:10 +0000 +++ lisp/calendar/cal-x.el 2010-08-29 16:17:13 +0000 @@ -8,6 +8,7 @@ ;; Maintainer: Glenn Morris ;; Keywords: calendar ;; Human-Keywords: calendar, dedicated frames +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/holidays.el' --- lisp/calendar/holidays.el 2010-01-13 08:35:10 +0000 +++ lisp/calendar/holidays.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Edward M. Reingold ;; Maintainer: Glenn Morris ;; Keywords: holidays, calendar +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/lunar.el' --- lisp/calendar/lunar.el 2010-01-13 08:35:10 +0000 +++ lisp/calendar/lunar.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: Glenn Morris ;; Keywords: calendar ;; Human-Keywords: moon, lunar phases, calendar, diary +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/calendar/solar.el' --- lisp/calendar/solar.el 2010-01-13 08:35:10 +0000 +++ lisp/calendar/solar.el 2010-08-29 16:17:13 +0000 @@ -8,6 +8,7 @@ ;; Maintainer: Glenn Morris ;; Keywords: calendar ;; Human-Keywords: sunrise, sunset, equinox, solstice, calendar, diary, holidays +;; Package: calendar ;; This file is part of GNU Emacs. === modified file 'lisp/case-table.el' --- lisp/case-table.el 2010-01-13 08:35:10 +0000 +++ lisp/case-table.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Howard Gayle ;; Maintainer: FSF ;; Keywords: i18n +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/cedet/cedet-cscope.el' --- lisp/cedet/cedet-cscope.el 2010-01-13 08:35:10 +0000 +++ lisp/cedet/cedet-cscope.el 2010-08-29 16:17:13 +0000 @@ -3,6 +3,7 @@ ;;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam +;; Package: cedet ;; This file is part of GNU Emacs. === modified file 'lisp/cedet/cedet-files.el' --- lisp/cedet/cedet-files.el 2010-01-18 03:58:35 +0000 +++ lisp/cedet/cedet-files.el 2010-08-29 16:17:13 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam +;; Package: cedet ;; This file is part of GNU Emacs. === modified file 'lisp/cedet/cedet-global.el' --- lisp/cedet/cedet-global.el 2010-01-13 08:35:10 +0000 +++ lisp/cedet/cedet-global.el 2010-08-29 16:17:13 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam +;; Package: cedet ;; This file is part of GNU Emacs. === modified file 'lisp/cedet/cedet-idutils.el' --- lisp/cedet/cedet-idutils.el 2010-01-13 08:35:10 +0000 +++ lisp/cedet/cedet-idutils.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Eric M. Ludlam ;; Version: 0.2 ;; Keywords: OO, lisp +;; Package: cedet ;; This file is part of GNU Emacs. === modified file 'lisp/cedet/data-debug.el' --- lisp/cedet/data-debug.el 2010-02-16 14:35:45 +0000 +++ lisp/cedet/data-debug.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Eric M. Ludlam ;; Version: 0.2 ;; Keywords: OO, lisp +;; Package: cedet ;; This file is part of GNU Emacs. === modified file 'lisp/cedet/semantic.el' --- lisp/cedet/semantic.el 2010-04-29 15:32:11 +0000 +++ lisp/cedet/semantic.el 2010-08-29 16:17:13 +0000 @@ -4,7 +4,7 @@ ;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam -;; Keywords: syntax +;; Keywords: syntax tools ;; This file is part of GNU Emacs. === modified file 'lisp/comint.el' --- lisp/comint.el 2010-08-06 13:53:59 +0000 +++ lisp/comint.el 2010-08-29 16:17:13 +0000 @@ -8,6 +8,7 @@ ;; Simon Marshall ;; Maintainer: FSF ;; Keywords: processes +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/composite.el' --- lisp/composite.el 2010-05-20 01:27:49 +0000 +++ lisp/composite.el 2010-08-29 16:17:13 +0000 @@ -8,6 +8,7 @@ ;; Author: Kenichi HANDA ;; (according to ack.texi) ;; Keywords: mule, multilingual, character composition +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/cus-dep.el' --- lisp/cus-dep.el 2010-01-13 08:35:10 +0000 +++ lisp/cus-dep.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; ;; Author: Per Abrahamsen ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/cus-edit.el' --- lisp/cus-edit.el 2010-08-21 14:46:43 +0000 +++ lisp/cus-edit.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Per Abrahamsen ;; Maintainer: FSF ;; Keywords: help, faces +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/cus-face.el' --- lisp/cus-face.el 2010-01-13 08:35:10 +0000 +++ lisp/cus-face.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; ;; Author: Per Abrahamsen ;; Keywords: help, faces +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/cus-start.el' --- lisp/cus-start.el 2010-08-16 02:33:17 +0000 +++ lisp/cus-start.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; ;; Author: Per Abrahamsen ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/cus-theme.el' --- lisp/cus-theme.el 2010-01-13 08:35:10 +0000 +++ lisp/cus-theme.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Alex Schroeder ;; Maintainer: FSF ;; Keywords: help, faces +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/custom.el' --- lisp/custom.el 2010-07-23 01:29:46 +0000 +++ lisp/custom.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Per Abrahamsen ;; Maintainer: FSF ;; Keywords: help, faces +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/dired-aux.el' --- lisp/dired-aux.el 2010-01-20 16:42:50 +0000 +++ lisp/dired-aux.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Sebastian Kremer . ;; Maintainer: FSF ;; Keywords: files +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/dired-x.el' --- lisp/dired-x.el 2010-05-20 21:33:58 +0000 +++ lisp/dired-x.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Lawrence R. Dodd ;; Maintainer: Romain Francoise ;; Keywords: dired extensions files +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/dired.el' --- lisp/dired.el 2010-07-27 02:10:05 +0000 +++ lisp/dired.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Author: Sebastian Kremer ;; Maintainer: FSF ;; Keywords: files +;; Package: emacs ;; This file is part of GNU Emacs. @@ -3534,7 +3535,7 @@ ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff -;;;;;; dired-diff) "dired-aux" "dired-aux.el" "07676ea25af17f5d50cc5db4f53bddc0") +;;;;;; dired-diff) "dired-aux" "dired-aux.el" "416d272299fd4774c47c2f677ee640a4") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ @@ -3987,7 +3988,7 @@ ;;;*** ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el" -;;;;;; "6c492aba3ca0d36a4cd7b02fb9c1cc10") +;;;;;; "27c312d6d5d40d8cb4ef8d62e30d5f4a") ;;; Generated autoloads from dired-x.el (autoload 'dired-jump "dired-x" "\ === modified file 'lisp/disp-table.el' --- lisp/disp-table.el 2010-01-13 08:35:10 +0000 +++ lisp/disp-table.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Based on a previous version by Howard Gayle ;; Maintainer: FSF ;; Keywords: i18n +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/dnd.el' --- lisp/dnd.el 2010-06-22 07:10:16 +0000 +++ lisp/dnd.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Jan Djärv ;; Maintainer: FSF ;; Keywords: window, drag, drop +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/dos-fns.el' --- lisp/dos-fns.el 2010-05-15 08:31:40 +0000 +++ lisp/dos-fns.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: Morten Welinder ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/dos-vars.el' --- lisp/dos-vars.el 2010-01-13 08:35:10 +0000 +++ lisp/dos-vars.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/dos-w32.el' --- lisp/dos-w32.el 2010-01-13 08:35:10 +0000 +++ lisp/dos-w32.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: Geoff Voelker ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/dynamic-setting.el' --- lisp/dynamic-setting.el 2010-08-11 18:28:10 +0000 +++ lisp/dynamic-setting.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Jan Djärv ;; Maintainer: FSF ;; Keywords: font, system-font, tool-bar-style +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/advice.el' --- lisp/emacs-lisp/advice.el 2010-06-09 01:18:31 +0000 +++ lisp/emacs-lisp/advice.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: FSF ;; Created: 12 Dec 1992 ;; Keywords: extensions, lisp, tools +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/autoload.el' --- lisp/emacs-lisp/autoload.el 2010-08-18 10:21:43 +0000 +++ lisp/emacs-lisp/autoload.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Roland McGrath ;; Keywords: maint +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/backquote.el' --- lisp/emacs-lisp/backquote.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/backquote.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Rick Sladkey ;; Maintainer: FSF ;; Keywords: extensions, internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/byte-opt.el' --- lisp/emacs-lisp/byte-opt.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/byte-opt.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Hallvard Furuseth ;; Maintainer: FSF ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/byte-run.el' --- lisp/emacs-lisp/byte-run.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/byte-run.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Hallvard Furuseth ;; Maintainer: FSF ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/bytecomp.el' --- lisp/emacs-lisp/bytecomp.el 2010-05-25 00:54:13 +0000 +++ lisp/emacs-lisp/bytecomp.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Hallvard Furuseth ;; Maintainer: FSF ;; Keywords: lisp +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/cl-compat.el' --- lisp/emacs-lisp/cl-compat.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/cl-compat.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Dave Gillespie ;; Version: 2.02 ;; Keywords: extensions +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/cl-extra.el' --- lisp/emacs-lisp/cl-extra.el 2010-05-25 02:11:08 +0000 +++ lisp/emacs-lisp/cl-extra.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Dave Gillespie ;; Keywords: extensions +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/cl-indent.el' --- lisp/emacs-lisp/cl-indent.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/cl-indent.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Created: July 1987 ;; Maintainer: FSF ;; Keywords: lisp, tools +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/cl-loaddefs.el' --- lisp/emacs-lisp/cl-loaddefs.el 2010-07-10 19:47:59 +0000 +++ lisp/emacs-lisp/cl-loaddefs.el 2010-08-29 16:17:13 +0000 @@ -10,7 +10,7 @@ ;;;;;; ceiling* floor* isqrt lcm gcd cl-progv-before cl-set-frame-visible-p ;;;;;; cl-map-overlays cl-map-intervals cl-map-keymap-recursively ;;;;;; notevery notany every some mapcon mapcan mapl maplist map -;;;;;; cl-mapcar-many equalp coerce) "cl-extra" "cl-extra.el" "deb3495d75c36a222e5238eadb8e347c") +;;;;;; cl-mapcar-many equalp coerce) "cl-extra" "cl-extra.el" "20c8c875ff1d11dd819e15a1f25afd73") ;;; Generated autoloads from cl-extra.el (autoload 'coerce "cl-extra" "\ @@ -277,12 +277,12 @@ ;;;;;; assert check-type typep deftype cl-struct-setf-expander defstruct ;;;;;; define-modify-macro callf2 callf letf* letf rotatef shiftf ;;;;;; remf cl-do-pop psetf setf get-setf-method defsetf define-setf-method -;;;;;; declare the locally multiple-value-setq multiple-value-bind -;;;;;; lexical-let* lexical-let symbol-macrolet macrolet labels -;;;;;; flet progv psetq do-all-symbols do-symbols dotimes dolist -;;;;;; do* do loop return-from return block etypecase typecase ecase -;;;;;; case load-time-value eval-when destructuring-bind function* -;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "36cafd5054969b5bb0b1ce6a21605fed") +;;;;;; declare locally multiple-value-setq multiple-value-bind lexical-let* +;;;;;; lexical-let symbol-macrolet macrolet labels flet progv psetq +;;;;;; do-all-symbols do-symbols dotimes dolist do* do loop return-from +;;;;;; return block etypecase typecase ecase case load-time-value +;;;;;; eval-when destructuring-bind function* defmacro* defun* gentemp +;;;;;; gensym) "cl-macs" "cl-macs.el" "c5a12d86541b5137054eccc43e4fc839") ;;; Generated autoloads from cl-macs.el (autoload 'gensym "cl-macs" "\ @@ -535,11 +535,6 @@ \(fn &rest BODY)" nil (quote macro)) -(autoload 'the "cl-macs" "\ -Not documented - -\(fn TYPE FORM)" nil (quote macro)) - (autoload 'declare "cl-macs" "\ Not documented @@ -759,7 +754,7 @@ ;;;;;; find nsubstitute-if-not nsubstitute-if nsubstitute substitute-if-not ;;;;;; substitute-if substitute delete-duplicates remove-duplicates ;;;;;; delete-if-not delete-if delete* remove-if-not remove-if remove* -;;;;;; replace fill reduce) "cl-seq" "cl-seq.el" "ec3ea1c77742734db8496272fe5721be") +;;;;;; replace fill reduce) "cl-seq" "cl-seq.el" "8f4ba525c894365101b9a53905db94ba") ;;; Generated autoloads from cl-seq.el (autoload 'reduce "cl-seq" "\ === modified file 'lisp/emacs-lisp/cl-macs.el' --- lisp/emacs-lisp/cl-macs.el 2010-06-16 20:08:41 +0000 +++ lisp/emacs-lisp/cl-macs.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Dave Gillespie ;; Version: 2.02 ;; Keywords: extensions +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/cl-seq.el' --- lisp/emacs-lisp/cl-seq.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/cl-seq.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Dave Gillespie ;; Version: 2.02 ;; Keywords: extensions +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/cl-specs.el' --- lisp/emacs-lisp/cl-specs.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/cl-specs.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte ;; Keywords: lisp, tools, maint +;; Package: emacs ;; LCD Archive Entry: ;; cl-specs.el|Daniel LaLiberte|liberte@holonexus.org === modified file 'lisp/emacs-lisp/derived.el' --- lisp/emacs-lisp/derived.el 2010-04-28 15:18:37 +0000 +++ lisp/emacs-lisp/derived.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Author: David Megginson (dmeggins@aix1.uottawa.ca) ;; Maintainer: FSF ;; Keywords: extensions +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/easy-mmode.el' --- lisp/emacs-lisp/easy-mmode.el 2010-08-22 20:02:16 +0000 +++ lisp/emacs-lisp/easy-mmode.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Georges Brun-Cottan ;; Maintainer: Stefan Monnier +;; Package: emacs ;; Keywords: extensions lisp === modified file 'lisp/emacs-lisp/easymenu.el' --- lisp/emacs-lisp/easymenu.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/easymenu.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Keywords: emulations ;; Author: Richard Stallman +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/eieio-base.el' --- lisp/emacs-lisp/eieio-base.el 2010-01-14 18:59:31 +0000 +++ lisp/emacs-lisp/eieio-base.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Eric M. Ludlam ;; Version: 0.2 ;; Keywords: OO, lisp +;; Package: eieio ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/eieio-comp.el' --- lisp/emacs-lisp/eieio-comp.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/eieio-comp.el 2010-08-29 16:17:13 +0000 @@ -5,7 +5,8 @@ ;; Author: Eric M. Ludlam ;; Version: 0.2 -;; Keywords: oop, lisp, tools +;; Keywords: lisp, tools +;; Package: eieio ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/eieio-custom.el' --- lisp/emacs-lisp/eieio-custom.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/eieio-custom.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Eric M. Ludlam ;; Version: 0.2 ;; Keywords: OO, lisp +;; Package: eieio ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/eieio-datadebug.el' --- lisp/emacs-lisp/eieio-datadebug.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/eieio-datadebug.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; Author: Eric M. Ludlam ;; Keywords: OO, lisp +;; Package: eieio ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/eieio-opt.el' --- lisp/emacs-lisp/eieio-opt.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/eieio-opt.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Eric M. Ludlam ;; Version: 0.2 ;; Keywords: OO, lisp +;; Package: eieio ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/eieio-speedbar.el' --- lisp/emacs-lisp/eieio-speedbar.el 2010-01-18 04:39:40 +0000 +++ lisp/emacs-lisp/eieio-speedbar.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Eric M. Ludlam ;; Version: 0.2 ;; Keywords: OO, tools +;; Package: eieio ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/float-sup.el' --- lisp/emacs-lisp/float-sup.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/float-sup.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/generic.el' --- lisp/emacs-lisp/generic.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/generic.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Peter Breton ;; Created: Fri Sep 27 1996 ;; Keywords: generic, comment, font-lock +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/helper.el' --- lisp/emacs-lisp/helper.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/helper.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: K. Shane Hartman ;; Maintainer: FSF ;; Keywords: help +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/lisp-mode.el' --- lisp/emacs-lisp/lisp-mode.el 2010-08-12 14:44:16 +0000 +++ lisp/emacs-lisp/lisp-mode.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: lisp, languages +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/lisp.el' --- lisp/emacs-lisp/lisp.el 2010-08-17 20:18:40 +0000 +++ lisp/emacs-lisp/lisp.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: lisp, languages +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/package-x.el' --- lisp/emacs-lisp/package-x.el 2010-08-09 18:05:56 +0000 +++ lisp/emacs-lisp/package-x.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Created: 10 Mar 2007 ;; Version: 0.9 ;; Keywords: tools +;; Package: package ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/tcover-ses.el' --- lisp/emacs-lisp/tcover-ses.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/tcover-ses.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Jonathan Yavner ;; Maintainer: Jonathan Yavner ;; Keywords: spreadsheet lisp utility +;; Package: testcover ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by === modified file 'lisp/emacs-lisp/tcover-unsafep.el' --- lisp/emacs-lisp/tcover-unsafep.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/tcover-unsafep.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Jonathan Yavner ;; Maintainer: Jonathan Yavner ;; Keywords: safety lisp utility +;; Package: testcover ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/timer.el' --- lisp/emacs-lisp/timer.el 2010-08-02 09:00:46 +0000 +++ lisp/emacs-lisp/timer.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2009, 2010 Free Software Foundation, Inc. ;; Maintainer: FSF +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/emulation/cua-gmrk.el' --- lisp/emulation/cua-gmrk.el 2010-05-10 14:37:59 +0000 +++ lisp/emulation/cua-gmrk.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Kim F. Storm ;; Keywords: keyboard emulations convenience cua mark +;; Package: cua-base ;; This file is part of GNU Emacs. === modified file 'lisp/emulation/cua-rect.el' --- lisp/emulation/cua-rect.el 2010-06-09 22:08:50 +0000 +++ lisp/emulation/cua-rect.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Kim F. Storm ;; Keywords: keyboard emulations convenience CUA +;; Package: cua-base ;; This file is part of GNU Emacs. === modified file 'lisp/emulation/edt-lk201.el' --- lisp/emulation/edt-lk201.el 2010-01-13 08:35:10 +0000 +++ lisp/emulation/edt-lk201.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Kevin Gallagher ;; Maintainer: Kevin Gallagher ;; Keywords: emulations +;; Package: edt ;; This file is part of GNU Emacs. === modified file 'lisp/emulation/edt-mapper.el' --- lisp/emulation/edt-mapper.el 2010-01-13 08:35:10 +0000 +++ lisp/emulation/edt-mapper.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Kevin Gallagher ;; Maintainer: Kevin Gallagher ;; Keywords: emulations +;; Package: edt ;; This file is part of GNU Emacs. === modified file 'lisp/emulation/edt-pc.el' --- lisp/emulation/edt-pc.el 2010-01-13 08:35:10 +0000 +++ lisp/emulation/edt-pc.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Kevin Gallagher ;; Maintainer: Kevin Gallagher ;; Keywords: emulations +;; Package: edt ;; This file is part of GNU Emacs. === modified file 'lisp/emulation/edt-vt100.el' --- lisp/emulation/edt-vt100.el 2010-01-13 08:35:10 +0000 +++ lisp/emulation/edt-vt100.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Kevin Gallagher ;; Maintainer: Kevin Gallagher ;; Keywords: emulations +;; Package: edt ;; This file is part of GNU Emacs. === modified file 'lisp/emulation/tpu-edt.el' --- lisp/emulation/tpu-edt.el 2010-01-13 12:34:53 +0000 +++ lisp/emulation/tpu-edt.el 2010-08-29 16:17:13 +0000 @@ -2438,7 +2438,7 @@ ;;;### (autoloads (tpu-set-cursor-bound tpu-set-cursor-free tpu-set-scroll-margins -;;;;;; tpu-cursor-free-mode) "tpu-extras" "tpu-extras.el" "d003e4c2f1291eccc629926bb0f88e17") +;;;;;; tpu-cursor-free-mode) "tpu-extras" "tpu-extras.el" "78abc50917c93d2b35596d307fc638c4") ;;; Generated autoloads from tpu-extras.el (autoload 'tpu-cursor-free-mode "tpu-extras" "\ === modified file 'lisp/emulation/tpu-extras.el' --- lisp/emulation/tpu-extras.el 2010-01-13 08:35:10 +0000 +++ lisp/emulation/tpu-extras.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Rob Riepel ;; Maintainer: Rob Riepel ;; Keywords: emulations +;; Package: tpu-edt ;; This file is part of GNU Emacs. === modified file 'lisp/emulation/tpu-mapper.el' --- lisp/emulation/tpu-mapper.el 2010-01-13 08:35:10 +0000 +++ lisp/emulation/tpu-mapper.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Rob Riepel ;; Maintainer: Rob Riepel ;; Keywords: emulations +;; Package: tpu-edt ;; This file is part of GNU Emacs. === modified file 'lisp/emulation/viper-cmd.el' --- lisp/emulation/viper-cmd.el 2010-07-02 14:09:36 +0000 +++ lisp/emulation/viper-cmd.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Michael Kifer +;; Package: viper ;; This file is part of GNU Emacs. === modified file 'lisp/emulation/viper-ex.el' --- lisp/emulation/viper-ex.el 2010-05-25 02:11:08 +0000 +++ lisp/emulation/viper-ex.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Michael Kifer +;; Package: viper ;; This file is part of GNU Emacs. === modified file 'lisp/emulation/viper-init.el' --- lisp/emulation/viper-init.el 2010-01-13 08:35:10 +0000 +++ lisp/emulation/viper-init.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Michael Kifer +;; Package: viper ;; This file is part of GNU Emacs. === modified file 'lisp/emulation/viper-keym.el' --- lisp/emulation/viper-keym.el 2010-01-13 08:35:10 +0000 +++ lisp/emulation/viper-keym.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Michael Kifer +;; Package: viper ;; This file is part of GNU Emacs. === modified file 'lisp/emulation/viper-macs.el' --- lisp/emulation/viper-macs.el 2010-01-13 08:35:10 +0000 +++ lisp/emulation/viper-macs.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Michael Kifer +;; Package: viper ;; This file is part of GNU Emacs. === modified file 'lisp/emulation/viper-mous.el' --- lisp/emulation/viper-mous.el 2010-01-13 08:35:10 +0000 +++ lisp/emulation/viper-mous.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Michael Kifer +;; Package: viper ;; This file is part of GNU Emacs. === modified file 'lisp/emulation/viper-util.el' --- lisp/emulation/viper-util.el 2010-01-13 08:35:10 +0000 +++ lisp/emulation/viper-util.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Michael Kifer +;; Package: viper ;; This file is part of GNU Emacs. === modified file 'lisp/env.el' --- lisp/env.el 2010-01-13 08:35:10 +0000 +++ lisp/env.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: processes, unix +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/epa-dired.el' --- lisp/epa-dired.el 2010-01-13 08:35:10 +0000 +++ lisp/epa-dired.el 2010-08-29 16:17:13 +0000 @@ -3,6 +3,7 @@ ;; Author: Daiki Ueno ;; Keywords: PGP, GnuPG +;; Package: epa ;; This file is part of GNU Emacs. === modified file 'lisp/epa-file.el' --- lisp/epa-file.el 2010-07-25 11:50:51 +0000 +++ lisp/epa-file.el 2010-08-29 16:17:13 +0000 @@ -3,6 +3,7 @@ ;; Author: Daiki Ueno ;; Keywords: PGP, GnuPG +;; Package: epa ;; This file is part of GNU Emacs. === modified file 'lisp/epa-hook.el' --- lisp/epa-hook.el 2010-01-13 08:35:10 +0000 +++ lisp/epa-hook.el 2010-08-29 16:17:13 +0000 @@ -3,6 +3,7 @@ ;; Author: Daiki Ueno ;; Keywords: PGP, GnuPG +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/epa-mail.el' --- lisp/epa-mail.el 2010-07-26 05:22:13 +0000 +++ lisp/epa-mail.el 2010-08-29 16:17:13 +0000 @@ -3,6 +3,7 @@ ;; Author: Daiki Ueno ;; Keywords: PGP, GnuPG, mail, message +;; Package: epa ;; This file is part of GNU Emacs. === modified file 'lisp/epg-config.el' --- lisp/epg-config.el 2010-03-12 17:47:22 +0000 +++ lisp/epg-config.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; Author: Daiki Ueno ;; Keywords: PGP, GnuPG +;; Package: epg ;; This file is part of GNU Emacs. === modified file 'lisp/facemenu.el' --- lisp/facemenu.el 2010-08-19 15:43:45 +0000 +++ lisp/facemenu.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Boris Goldowsky ;; Keywords: faces +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/faces.el' --- lisp/faces.el 2010-08-11 18:28:10 +0000 +++ lisp/faces.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Maintainer: FSF ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/files-x.el' --- lisp/files-x.el 2010-01-13 08:35:10 +0000 +++ lisp/files-x.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Juri Linkov ;; Maintainer: FSF ;; Keywords: files +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/files.el' --- lisp/files.el 2010-08-22 20:02:16 +0000 +++ lisp/files.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Maintainer: FSF +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/foldout.el' --- lisp/foldout.el 2010-01-13 08:35:10 +0000 +++ lisp/foldout.el 2010-08-29 16:17:13 +0000 @@ -6,7 +6,7 @@ ;; Author: Kevin Broadey ;; Maintainer: FSF ;; Created: 27 Jan 1994 -;; Version: foldout.el 1.10 dated 94/05/19 at 17:09:12 +;; Version: 1.10 ;; Keywords: folding, outlines ;; This file is part of GNU Emacs. === modified file 'lisp/font-core.el' --- lisp/font-core.el 2010-06-16 20:00:22 +0000 +++ lisp/font-core.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Maintainer: FSF ;; Keywords: languages, faces +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/font-lock.el' --- lisp/font-lock.el 2010-08-14 23:42:07 +0000 +++ lisp/font-lock.el 2010-08-29 16:17:13 +0000 @@ -9,6 +9,7 @@ ;; Stefan Monnier ;; Maintainer: FSF ;; Keywords: languages, faces +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/format.el' --- lisp/format.el 2010-01-13 08:35:10 +0000 +++ lisp/format.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Boris Goldowsky +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/frame.el' --- lisp/frame.el 2010-08-02 22:35:38 +0000 +++ lisp/frame.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/fringe.el' --- lisp/fringe.el 2010-01-13 08:35:10 +0000 +++ lisp/fringe.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Simon Josefsson ;; Maintainer: FSF ;; Keywords: frames +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/help-fns.el' --- lisp/help-fns.el 2010-07-23 01:51:48 +0000 +++ lisp/help-fns.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Maintainer: FSF ;; Keywords: help, internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/help-macro.el' --- lisp/help-macro.el 2010-01-13 08:35:10 +0000 +++ lisp/help-macro.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: FSF ;; Created: Mon Oct 1 11:42:39 1990 ;; Adapted-By: ESR +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/help-mode.el' --- lisp/help-mode.el 2010-06-20 04:55:14 +0000 +++ lisp/help-mode.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: help, internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/help.el' --- lisp/help.el 2010-08-26 03:31:34 +0000 +++ lisp/help.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: help, internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/image-mode.el' --- lisp/image-mode.el 2010-08-17 21:19:11 +0000 +++ lisp/image-mode.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; ;; Author: Richard Stallman ;; Keywords: multimedia +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/image.el' --- lisp/image.el 2010-08-18 11:11:01 +0000 +++ lisp/image.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: multimedia +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/indent.el' --- lisp/indent.el 2010-05-19 03:06:48 +0000 +++ lisp/indent.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Maintainer: FSF +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/isearch.el' --- lisp/isearch.el 2010-08-08 21:12:29 +0000 +++ lisp/isearch.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Author: Daniel LaLiberte ;; Maintainer: FSF ;; Keywords: matching +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/jit-lock.el' --- lisp/jit-lock.el 2010-01-13 08:35:10 +0000 +++ lisp/jit-lock.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Gerd Moellmann ;; Keywords: faces files +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/jka-cmpr-hook.el' --- lisp/jka-cmpr-hook.el 2010-01-13 08:35:10 +0000 +++ lisp/jka-cmpr-hook.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: jka@ece.cmu.edu (Jay K. Adams) ;; Maintainer: FSF ;; Keywords: data +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/loadup.el' --- lisp/loadup.el 2010-06-11 21:19:23 +0000 +++ lisp/loadup.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/ls-lisp.el' --- lisp/ls-lisp.el 2010-05-29 07:55:40 +0000 +++ lisp/ls-lisp.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Modified by: Francis J. Wright ;; Maintainer: FSF ;; Keywords: unix, dired +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/macros.el' --- lisp/macros.el 2010-03-03 17:31:50 +0000 +++ lisp/macros.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: abbrev +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/mail/blessmail.el' --- lisp/mail/blessmail.el 2010-01-13 08:35:10 +0000 +++ lisp/mail/blessmail.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/mail/emacsbug.el' --- lisp/mail/emacsbug.el 2010-08-17 10:07:41 +0000 +++ lisp/mail/emacsbug.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Author: K. Shane Hartman ;; Maintainer: FSF ;; Keywords: maint mail +;; Package: emacs ;; This file is part of GNU Emacs. @@ -119,7 +120,7 @@ (concat "mailto:" to)) (error "Subject, To or body not found"))))) - + ;;;###autoload (defun report-emacs-bug (topic &optional recent-keys) "Report a bug in GNU Emacs. @@ -274,7 +275,7 @@ (use-local-map (nconc (make-sparse-keymap) (current-local-map))) (define-key (current-local-map) "\C-c\C-i" 'report-emacs-bug-info) (if can-xdg-email - (define-key (current-local-map) "\C-cm" + (define-key (current-local-map) "\C-cm" 'report-emacs-bug-insert-to-mailer)) ;; Could test major-mode instead. (cond ((memq mail-user-agent '(message-user-agent gnus-user-agent)) === modified file 'lisp/mail/mail-extr.el' --- lisp/mail/mail-extr.el 2010-01-13 08:35:10 +0000 +++ lisp/mail/mail-extr.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Joe Wells ;; Maintainer: FSF ;; Keywords: mail +;; Package: mail-utils ;; This file is part of GNU Emacs. === modified file 'lisp/mail/mail-hist.el' --- lisp/mail/mail-hist.el 2010-01-13 08:35:10 +0000 +++ lisp/mail/mail-hist.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Karl Fogel ;; Created: March, 1994 ;; Keywords: mail, history +;; Package: mail-utils ;; This file is part of GNU Emacs. === modified file 'lisp/mail/mailheader.el' --- lisp/mail/mailheader.el 2010-01-13 08:35:10 +0000 +++ lisp/mail/mailheader.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Erik Naggum ;; Keywords: tools, mail, news +;; Package: mail-utils ;; This file is part of GNU Emacs. === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2010-08-22 20:02:16 +0000 +++ lisp/mail/rmail.el 2010-08-29 16:17:13 +0000 @@ -4239,7 +4239,7 @@ ;;; Start of automatically extracted autoloads. ;;;### (autoloads (rmail-edit-current-message) "rmailedit" "rmailedit.el" -;;;;;; "60db8013bf16d7999914a16cda435287") +;;;;;; "4bf8a5cdfc921b9e30680ee71b7f9ca6") ;;; Generated autoloads from rmailedit.el (autoload 'rmail-edit-current-message "rmailedit" "\ @@ -4251,7 +4251,7 @@ ;;;### (autoloads (rmail-next-labeled-message rmail-previous-labeled-message ;;;;;; rmail-read-label rmail-kill-label rmail-add-label) "rmailkwd" -;;;;;; "rmailkwd.el" "7027ce1ac922c0dd51262b641e4d42c1") +;;;;;; "rmailkwd.el" "112240cbb53c402294013cc49987771a") ;;; Generated autoloads from rmailkwd.el (autoload 'rmail-add-label "rmailkwd" "\ @@ -4294,7 +4294,7 @@ ;;;*** -;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "4a7502b4aeb3bd5f2111b48cc6512924") +;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "9f67f3b67de9b700b128b73c52abfefa") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ @@ -4310,7 +4310,7 @@ ;;;*** ;;;### (autoloads (set-rmail-inbox-list) "rmailmsc" "rmailmsc.el" -;;;;;; "b2a72d4e370f2d2b31b6f8f0794820e4") +;;;;;; "c3575020691d5769bcf08ecc932304c3") ;;; Generated autoloads from rmailmsc.el (autoload 'set-rmail-inbox-list "rmailmsc" "\ @@ -4326,7 +4326,7 @@ ;;;### (autoloads (rmail-sort-by-labels rmail-sort-by-lines rmail-sort-by-correspondent ;;;;;; rmail-sort-by-recipient rmail-sort-by-author rmail-sort-by-subject -;;;;;; rmail-sort-by-date) "rmailsort" "rmailsort.el" "5a3b5ee477d2fbf79d0c566d776a7fd4") +;;;;;; rmail-sort-by-date) "rmailsort" "rmailsort.el" "b96e85edd736f23f1e9d54a299268d1e") ;;; Generated autoloads from rmailsort.el (autoload 'rmail-sort-by-date "rmailsort" "\ @@ -4385,7 +4385,7 @@ ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic ;;;;;; rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels -;;;;;; rmail-summary) "rmailsum" "rmailsum.el" "26b95919c7e1f8c5609ce7323aee77ae") +;;;;;; rmail-summary) "rmailsum" "rmailsum.el" "4715fb58fb191bf6b192458ea75524b2") ;;; Generated autoloads from rmailsum.el (autoload 'rmail-summary "rmailsum" "\ === modified file 'lisp/mail/rmailedit.el' --- lisp/mail/rmailedit.el 2010-01-13 08:35:10 +0000 +++ lisp/mail/rmailedit.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: mail +;; Package: rmail ;; This file is part of GNU Emacs. === modified file 'lisp/mail/rmailkwd.el' --- lisp/mail/rmailkwd.el 2010-01-13 08:35:10 +0000 +++ lisp/mail/rmailkwd.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: mail +;; Package: rmail ;; This file is part of GNU Emacs. === modified file 'lisp/mail/rmailmm.el' --- lisp/mail/rmailmm.el 2010-07-16 09:59:37 +0000 +++ lisp/mail/rmailmm.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Alex Schroeder ;; Maintainer: FSF ;; Keywords: mail +;; Package: rmail ;; This file is part of GNU Emacs. === modified file 'lisp/mail/rmailmsc.el' --- lisp/mail/rmailmsc.el 2010-01-13 08:35:10 +0000 +++ lisp/mail/rmailmsc.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: mail +;; Package: rmail ;; This file is part of GNU Emacs. === modified file 'lisp/mail/rmailout.el' --- lisp/mail/rmailout.el 2010-01-13 08:35:10 +0000 +++ lisp/mail/rmailout.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: mail +;; Package: rmail ;; This file is part of GNU Emacs. === modified file 'lisp/mail/rmailsort.el' --- lisp/mail/rmailsort.el 2010-01-13 08:35:10 +0000 +++ lisp/mail/rmailsort.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Masanobu UMEDA ;; Maintainer: FSF ;; Keywords: mail +;; Package: rmail ;; This file is part of GNU Emacs. === modified file 'lisp/mail/rmailsum.el' --- lisp/mail/rmailsum.el 2010-01-13 08:35:10 +0000 +++ lisp/mail/rmailsum.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: mail +;; Package: rmail ;; This file is part of GNU Emacs. === modified file 'lisp/menu-bar.el' --- lisp/menu-bar.el 2010-08-26 03:31:34 +0000 +++ lisp/menu-bar.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: RMS ;; Maintainer: FSF ;; Keywords: internal, mouse +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2010-06-24 21:51:14 +0000 +++ lisp/minibuffer.el 2010-08-29 16:17:13 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Stefan Monnier +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/misc.el' --- lisp/misc.el 2010-01-13 08:35:10 +0000 +++ lisp/misc.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: convenience +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/mouse.el' --- lisp/mouse.el 2010-08-24 15:48:14 +0000 +++ lisp/mouse.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: hardware, mouse +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/mwheel.el' --- lisp/mwheel.el 2010-04-16 01:24:00 +0000 +++ lisp/mwheel.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Maintainer: William M. Perry ;; Keywords: mouse +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/net/eudc-bob.el' --- lisp/net/eudc-bob.el 2010-01-13 08:35:10 +0000 +++ lisp/net/eudc-bob.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Oscar Figueiredo ;; Maintainer: Pavel Janík ;; Keywords: comm +;; Package: eudc ;; This file is part of GNU Emacs. === modified file 'lisp/net/eudc-export.el' --- lisp/net/eudc-export.el 2010-01-13 08:35:10 +0000 +++ lisp/net/eudc-export.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Oscar Figueiredo ;; Maintainer: Pavel Janík ;; Keywords: comm +;; Package: eudc ;; This file is part of GNU Emacs. === modified file 'lisp/net/eudc-hotlist.el' --- lisp/net/eudc-hotlist.el 2010-01-13 08:35:10 +0000 +++ lisp/net/eudc-hotlist.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Oscar Figueiredo ;; Maintainer: Pavel Janík ;; Keywords: comm +;; Package: eudc ;; This file is part of GNU Emacs. === modified file 'lisp/net/eudc-vars.el' --- lisp/net/eudc-vars.el 2010-01-13 08:35:10 +0000 +++ lisp/net/eudc-vars.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Oscar Figueiredo ;; Maintainer: Pavel Janík ;; Keywords: comm +;; Package: eudc ;; This file is part of GNU Emacs. === modified file 'lisp/net/eudcb-bbdb.el' --- lisp/net/eudcb-bbdb.el 2010-01-13 08:35:10 +0000 +++ lisp/net/eudcb-bbdb.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Oscar Figueiredo ;; Maintainer: Pavel Janík ;; Keywords: comm +;; Package: eudc ;; This file is part of GNU Emacs. === modified file 'lisp/net/eudcb-ldap.el' --- lisp/net/eudcb-ldap.el 2010-01-13 08:35:10 +0000 +++ lisp/net/eudcb-ldap.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Oscar Figueiredo ;; Maintainer: Pavel Janík ;; Keywords: comm +;; Package: eudc ;; This file is part of GNU Emacs. === modified file 'lisp/net/eudcb-mab.el' --- lisp/net/eudcb-mab.el 2010-01-13 08:35:10 +0000 +++ lisp/net/eudcb-mab.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: John Wiegley ;; Maintainer: FSF ;; Keywords: comm +;; Package: eudc ;; This file is part of GNU Emacs. === modified file 'lisp/net/eudcb-ph.el' --- lisp/net/eudcb-ph.el 2010-01-13 08:35:10 +0000 +++ lisp/net/eudcb-ph.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Oscar Figueiredo ;; Maintainer: Pavel Janík ;; Keywords: comm +;; Package: eudc ;; This file is part of GNU Emacs. === modified file 'lisp/net/newst-backend.el' --- lisp/net/newst-backend.el 2010-01-13 08:35:10 +0000 +++ lisp/net/newst-backend.el 2010-08-29 16:17:13 +0000 @@ -8,6 +8,7 @@ ;; URL: http://www.nongnu.org/newsticker ;; Keywords: News, RSS, Atom ;; Time-stamp: "6. Dezember 2009, 19:15:32 (ulf)" +;; Package: newsticker ;; ====================================================================== === modified file 'lisp/net/newst-plainview.el' --- lisp/net/newst-plainview.el 2010-01-13 08:35:10 +0000 +++ lisp/net/newst-plainview.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Filename: newst-plainview.el ;; URL: http://www.nongnu.org/newsticker ;; Time-stamp: "6. Dezember 2009, 19:17:02 (ulf)" +;; Package: newsticker ;; ====================================================================== === modified file 'lisp/net/newst-reader.el' --- lisp/net/newst-reader.el 2010-01-13 08:35:10 +0000 +++ lisp/net/newst-reader.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Filename: newst-reader.el ;; URL: http://www.nongnu.org/newsticker ;; Time-stamp: "6. Dezember 2009, 19:16:38 (ulf)" +;; Package: newsticker ;; ====================================================================== === modified file 'lisp/net/newst-ticker.el' --- lisp/net/newst-ticker.el 2010-01-13 08:35:10 +0000 +++ lisp/net/newst-ticker.el 2010-08-29 16:17:13 +0000 @@ -8,6 +8,7 @@ ;; URL: http://www.nongnu.org/newsticker ;; Keywords: News, RSS, Atom ;; Time-stamp: "6. Dezember 2009, 19:16:00 (ulf)" +;; Package: newsticker ;; ====================================================================== === modified file 'lisp/net/newst-treeview.el' --- lisp/net/newst-treeview.el 2010-01-13 08:35:10 +0000 +++ lisp/net/newst-treeview.el 2010-08-29 16:17:13 +0000 @@ -8,6 +8,7 @@ ;; Created: 2007 ;; Keywords: News, RSS, Atom ;; Time-stamp: "6. Dezember 2009, 19:17:28 (ulf)" +;; Package: newsticker ;; ====================================================================== === modified file 'lisp/net/sasl-cram.el' --- lisp/net/sasl-cram.el 2010-01-13 08:35:10 +0000 +++ lisp/net/sasl-cram.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Daiki Ueno ;; Kenichi OKADA ;; Keywords: SASL, CRAM-MD5 +;; Package: sasl ;; This file is part of GNU Emacs. === modified file 'lisp/net/sasl-digest.el' --- lisp/net/sasl-digest.el 2010-01-13 08:35:10 +0000 +++ lisp/net/sasl-digest.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Daiki Ueno ;; Kenichi OKADA ;; Keywords: SASL, DIGEST-MD5 +;; Package: sasl ;; This file is part of GNU Emacs. === modified file 'lisp/net/sasl-ntlm.el' --- lisp/net/sasl-ntlm.el 2010-01-13 08:35:10 +0000 +++ lisp/net/sasl-ntlm.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Keywords: SASL, NTLM ;; Version: 1.00 ;; Created: February 2001 +;; Package: sasl ;; This file is part of GNU Emacs. === modified file 'lisp/net/tramp-cache.el' --- lisp/net/tramp-cache.el 2010-02-15 15:04:53 +0000 +++ lisp/net/tramp-cache.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Daniel Pittman ;; Michael Albinus ;; Keywords: comm, processes +;; Package: tramp ;; This file is part of GNU Emacs. === modified file 'lisp/net/tramp-cmds.el' --- lisp/net/tramp-cmds.el 2010-07-28 10:02:18 +0000 +++ lisp/net/tramp-cmds.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; Author: Michael Albinus ;; Keywords: comm, processes +;; Package: tramp ;; This file is part of GNU Emacs. === modified file 'lisp/net/tramp-compat.el' --- lisp/net/tramp-compat.el 2010-06-12 08:59:37 +0000 +++ lisp/net/tramp-compat.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; Author: Michael Albinus ;; Keywords: comm, processes +;; Package: tramp ;; This file is part of GNU Emacs. === modified file 'lisp/net/tramp-fish.el' --- lisp/net/tramp-fish.el 2010-05-28 13:28:36 +0000 +++ lisp/net/tramp-fish.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; Author: Michael Albinus ;; Keywords: comm, processes +;; Package: tramp ;; This file is part of GNU Emacs. === modified file 'lisp/net/tramp-ftp.el' --- lisp/net/tramp-ftp.el 2010-05-28 13:28:36 +0000 +++ lisp/net/tramp-ftp.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Michael Albinus ;; Keywords: comm, processes +;; Package: tramp ;; This file is part of GNU Emacs. === modified file 'lisp/net/tramp-gvfs.el' --- lisp/net/tramp-gvfs.el 2010-07-11 08:28:04 +0000 +++ lisp/net/tramp-gvfs.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; Author: Michael Albinus ;; Keywords: comm, processes +;; Package: tramp ;; This file is part of GNU Emacs. === modified file 'lisp/net/tramp-gw.el' --- lisp/net/tramp-gw.el 2010-01-13 08:35:10 +0000 +++ lisp/net/tramp-gw.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; Author: Michael Albinus ;; Keywords: comm, processes +;; Package: tramp ;; This file is part of GNU Emacs. === modified file 'lisp/net/tramp-imap.el' --- lisp/net/tramp-imap.el 2010-05-28 13:28:36 +0000 +++ lisp/net/tramp-imap.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; Author: Teodor Zlatanov ;; Keywords: mail, comm +;; Package: tramp ;; This file is part of GNU Emacs. === modified file 'lisp/net/tramp-smb.el' --- lisp/net/tramp-smb.el 2010-06-04 11:26:54 +0000 +++ lisp/net/tramp-smb.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Michael Albinus ;; Keywords: comm, processes +;; Package: tramp ;; This file is part of GNU Emacs. === modified file 'lisp/net/tramp-uu.el' --- lisp/net/tramp-uu.el 2010-08-26 07:33:16 +0000 +++ lisp/net/tramp-uu.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Kai Großjohann ;; Keywords: comm, terminals +;; Package: tramp ;; This file is part of GNU Emacs. === modified file 'lisp/net/trampver.el' --- lisp/net/trampver.el 2010-08-26 07:33:16 +0000 +++ lisp/net/trampver.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Kai Großjohann ;; Keywords: comm, processes +;; Package: tramp ;; This file is part of GNU Emacs. === modified file 'lisp/newcomment.el' --- lisp/newcomment.el 2010-08-17 19:38:30 +0000 +++ lisp/newcomment.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: code extracted from Emacs-20's simple.el ;; Maintainer: Stefan Monnier ;; Keywords: comment uncomment +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/paths.el' --- lisp/paths.el 2010-01-14 18:37:23 +0000 +++ lisp/paths.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/pcmpl-cvs.el' --- lisp/pcmpl-cvs.el 2010-01-13 08:35:10 +0000 +++ lisp/pcmpl-cvs.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: John Wiegley +;; Package: pcomplete ;; This file is part of GNU Emacs. === modified file 'lisp/pcmpl-gnu.el' --- lisp/pcmpl-gnu.el 2010-01-13 08:35:10 +0000 +++ lisp/pcmpl-gnu.el 2010-08-29 16:17:13 +0000 @@ -3,6 +3,8 @@ ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Package: pcomplete + ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify === modified file 'lisp/pcmpl-linux.el' --- lisp/pcmpl-linux.el 2010-01-13 08:35:10 +0000 +++ lisp/pcmpl-linux.el 2010-08-29 16:17:13 +0000 @@ -3,6 +3,8 @@ ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Package: pcomplete + ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify === modified file 'lisp/pcmpl-rpm.el' --- lisp/pcmpl-rpm.el 2010-01-13 08:35:10 +0000 +++ lisp/pcmpl-rpm.el 2010-08-29 16:17:13 +0000 @@ -3,6 +3,8 @@ ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, ;; 2008, 2009, 2010 Free Software Foundation, Inc. +;; Package: pcomplete + ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify === modified file 'lisp/pcmpl-unix.el' --- lisp/pcmpl-unix.el 2010-01-16 20:50:23 +0000 +++ lisp/pcmpl-unix.el 2010-08-29 16:17:13 +0000 @@ -3,6 +3,8 @@ ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Package: pcomplete + ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify === modified file 'lisp/pgg-def.el' --- lisp/pgg-def.el 2010-01-13 08:35:10 +0000 +++ lisp/pgg-def.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Daiki Ueno ;; Created: 1999/11/02 ;; Keywords: PGP, OpenPGP, GnuPG +;; Package: pgg ;; This file is part of GNU Emacs. === modified file 'lisp/pgg-gpg.el' --- lisp/pgg-gpg.el 2010-01-13 08:35:10 +0000 +++ lisp/pgg-gpg.el 2010-08-29 16:17:13 +0000 @@ -4,10 +4,11 @@ ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Daiki Ueno -;; Symmetric encryption and gpg-agent support added by: +;; Symmetric encryption and gpg-agent support added by: ;; Sascha Wilde ;; Created: 1999/10/28 ;; Keywords: PGP, OpenPGP, GnuPG +;; Package: pgg ;; This file is part of GNU Emacs. === modified file 'lisp/pgg-parse.el' --- lisp/pgg-parse.el 2010-05-07 06:58:17 +0000 +++ lisp/pgg-parse.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Daiki Ueno ;; Created: 1999/10/28 ;; Keywords: PGP, OpenPGP, GnuPG +;; Package: pgg ;; This file is part of GNU Emacs. === modified file 'lisp/pgg-pgp.el' --- lisp/pgg-pgp.el 2010-01-13 08:35:10 +0000 +++ lisp/pgg-pgp.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Daiki Ueno ;; Created: 1999/11/02 ;; Keywords: PGP, OpenPGP +;; Package: pgg ;; This file is part of GNU Emacs. === modified file 'lisp/pgg-pgp5.el' --- lisp/pgg-pgp5.el 2010-01-13 08:35:10 +0000 +++ lisp/pgg-pgp5.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Daiki Ueno ;; Created: 1999/11/02 ;; Keywords: PGP, OpenPGP +;; Package: pgg ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/ada-prj.el' --- lisp/progmodes/ada-prj.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/ada-prj.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Emmanuel Briot ;; Maintainer: Stephen Leake ;; Keywords: languages, ada, project file +;; Package: ada-mode ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/ada-stmt.el' --- lisp/progmodes/ada-stmt.el 2010-01-14 18:59:31 +0000 +++ lisp/progmodes/ada-stmt.el 2010-08-29 16:17:13 +0000 @@ -9,6 +9,7 @@ ;; Rolf Ebert ;; Maintainer: Stephen Leake ;; Keywords: languages, ada +;; Package: ada-mode ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/ada-xref.el' --- lisp/progmodes/ada-xref.el 2010-05-30 02:51:53 +0000 +++ lisp/progmodes/ada-xref.el 2010-08-29 16:17:13 +0000 @@ -8,6 +8,7 @@ ;; Emmanuel Briot ;; Maintainer: Stephen Leake ;; Keywords: languages ada xref +;; Package: ada-mode ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/antlr-mode.el' --- lisp/progmodes/antlr-mode.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/antlr-mode.el 2010-08-29 16:17:13 +0000 @@ -5,7 +5,7 @@ ;; Author: Christoph.Wedler@sap.com ;; Keywords: languages, ANTLR, code generator -;; Version: (see `antlr-version' below) +;; Version: 2.2c ;; X-URL: http://antlr-mode.sourceforge.net/ ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/cc-align.el' --- lisp/progmodes/cc-align.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/cc-align.el 2010-08-29 16:17:13 +0000 @@ -12,8 +12,8 @@ ;; 1985 Richard M. Stallman ;; Maintainer: bug-cc-mode@gnu.org ;; Created: 22-Apr-1997 (split from cc-mode.el) -;; Version: See cc-mode.el -;; Keywords: c languages oop +;; Keywords: c languages +;; Package: cc-mode ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/cc-awk.el' --- lisp/progmodes/cc-awk.el 2010-05-25 02:11:08 +0000 +++ lisp/progmodes/cc-awk.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Alan Mackenzie (originally based on awk-mode.el) ;; Maintainer: FSF ;; Keywords: AWK, cc-mode, unix, languages +;; Package: cc-mode ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/cc-bytecomp.el' --- lisp/progmodes/cc-bytecomp.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/cc-bytecomp.el 2010-08-29 16:17:13 +0000 @@ -6,8 +6,8 @@ ;; Author: Martin Stjernholm ;; Maintainer: bug-cc-mode@gnu.org ;; Created: 15-Jul-2000 -;; Version: See cc-mode.el -;; Keywords: c languages oop +;; Keywords: c languages +;; Package: cc-mode ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/cc-cmds.el' --- lisp/progmodes/cc-cmds.el 2010-08-06 19:48:59 +0000 +++ lisp/progmodes/cc-cmds.el 2010-08-29 16:17:13 +0000 @@ -12,8 +12,8 @@ ;; 1985 Richard M. Stallman ;; Maintainer: bug-cc-mode@gnu.org ;; Created: 22-Apr-1997 (split from cc-mode.el) -;; Version: See cc-mode.el -;; Keywords: c languages oop +;; Keywords: c languages +;; Package: cc-mode ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/cc-compat.el' --- lisp/progmodes/cc-compat.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/cc-compat.el 2010-08-29 16:17:13 +0000 @@ -8,8 +8,8 @@ ;; 1994-1999 Barry A. Warsaw ;; Maintainer: bug-cc-mode@gnu.org ;; Created: August 1994, split from cc-mode.el -;; Version: See cc-mode.el -;; Keywords: c languages oop +;; Keywords: c languages +;; Package: cc-mode ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/cc-defs.el' --- lisp/progmodes/cc-defs.el 2010-06-21 21:08:26 +0000 +++ lisp/progmodes/cc-defs.el 2010-08-29 16:17:13 +0000 @@ -12,8 +12,8 @@ ;; 1985 Richard M. Stallman ;; Maintainer: bug-cc-mode@gnu.org ;; Created: 22-Apr-1997 (split from cc-mode.el) -;; Version: See cc-mode.el -;; Keywords: c languages oop +;; Keywords: c languages +;; Package: cc-mode ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/cc-engine.el' --- lisp/progmodes/cc-engine.el 2010-08-17 06:54:03 +0000 +++ lisp/progmodes/cc-engine.el 2010-08-29 16:17:13 +0000 @@ -12,8 +12,8 @@ ;; 1985 Richard M. Stallman ;; Maintainer: bug-cc-mode@gnu.org ;; Created: 22-Apr-1997 (split from cc-mode.el) -;; Version: See cc-mode.el -;; Keywords: c languages oop +;; Keywords: c languages +;; Package: cc-mode ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/cc-fonts.el' --- lisp/progmodes/cc-fonts.el 2010-07-31 20:01:08 +0000 +++ lisp/progmodes/cc-fonts.el 2010-08-29 16:17:13 +0000 @@ -6,8 +6,8 @@ ;; 2002- Martin Stjernholm ;; Maintainer: bug-cc-mode@gnu.org ;; Created: 07-Jan-2002 -;; Version: See cc-mode.el -;; Keywords: c languages oop +;; Keywords: c languages +;; Package: cc-mode ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/cc-langs.el' --- lisp/progmodes/cc-langs.el 2010-07-31 20:01:08 +0000 +++ lisp/progmodes/cc-langs.el 2010-08-29 16:17:13 +0000 @@ -12,8 +12,8 @@ ;; 1985 Richard M. Stallman ;; Maintainer: bug-cc-mode@gnu.org ;; Created: 22-Apr-1997 (split from cc-mode.el) -;; Version: See cc-mode.el -;; Keywords: c languages oop +;; Keywords: c languages +;; Package: cc-mode ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/cc-menus.el' --- lisp/progmodes/cc-menus.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/cc-menus.el 2010-08-29 16:17:13 +0000 @@ -11,8 +11,8 @@ ;; 1985 Richard M. Stallman ;; Maintainer: bug-cc-mode@gnu.org ;; Created: 22-Apr-1997 (split from cc-mode.el) -;; Version: See cc-mode.el -;; Keywords: c languages oop +;; Keywords: c languages +;; Package: cc-mode ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/cc-mode.el' --- lisp/progmodes/cc-mode.el 2010-08-17 06:54:03 +0000 +++ lisp/progmodes/cc-mode.el 2010-08-29 16:17:13 +0000 @@ -12,7 +12,7 @@ ;; 1985 Richard M. Stallman ;; Maintainer: bug-cc-mode@gnu.org ;; Created: a long, long, time ago. adapted from the original c-mode.el -;; Keywords: c languages oop +;; Keywords: c languages ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/cc-styles.el' --- lisp/progmodes/cc-styles.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/cc-styles.el 2010-08-29 16:17:13 +0000 @@ -12,8 +12,8 @@ ;; 1985 Richard M. Stallman ;; Maintainer: bug-cc-mode@gnu.org ;; Created: 22-Apr-1997 (split from cc-mode.el) -;; Version: See cc-mode.el -;; Keywords: c languages oop +;; Keywords: c languages +;; Package: cc-mode ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/cc-vars.el' --- lisp/progmodes/cc-vars.el 2010-07-31 20:01:08 +0000 +++ lisp/progmodes/cc-vars.el 2010-08-29 16:17:13 +0000 @@ -12,8 +12,8 @@ ;; 1985 Richard M. Stallman ;; Maintainer: bug-cc-mode@gnu.org ;; Created: 22-Apr-1997 (split from cc-mode.el) -;; Version: See cc-mode.el -;; Keywords: c languages oop +;; Keywords: c languages +;; Package: cc-mode ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/cwarn.el' --- lisp/progmodes/cwarn.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/cwarn.el 2010-08-29 16:17:13 +0000 @@ -6,7 +6,7 @@ ;; Author: Anders Lindgren ;; Keywords: c, languages, faces ;; X-Url: http://www.andersl.com/emacs -;; Version: 1.3.1 1999-12-13 +;; Version: 1.3.1 ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/ebnf-abn.el' --- lisp/progmodes/ebnf-abn.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/ebnf-abn.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: Vinicius Jose Latorre ;; Keywords: wp, ebnf, PostScript ;; Version: 1.2 +;; Package: ebnf2ps ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/ebnf-bnf.el' --- lisp/progmodes/ebnf-bnf.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/ebnf-bnf.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: Vinicius Jose Latorre ;; Keywords: wp, ebnf, PostScript ;; Version: 1.10 +;; Package: ebnf2ps ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/ebnf-dtd.el' --- lisp/progmodes/ebnf-dtd.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/ebnf-dtd.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: Vinicius Jose Latorre ;; Keywords: wp, ebnf, PostScript ;; Version: 1.1 +;; Package: ebnf2ps ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/ebnf-ebx.el' --- lisp/progmodes/ebnf-ebx.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/ebnf-ebx.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: Vinicius Jose Latorre ;; Keywords: wp, ebnf, PostScript ;; Version: 1.2 +;; Package: ebnf2ps ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/ebnf-iso.el' --- lisp/progmodes/ebnf-iso.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/ebnf-iso.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: Vinicius Jose Latorre ;; Keywords: wp, ebnf, PostScript ;; Version: 1.9 +;; Package: ebnf2ps ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/ebnf-otz.el' --- lisp/progmodes/ebnf-otz.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/ebnf-otz.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: Vinicius Jose Latorre ;; Keywords: wp, ebnf, PostScript ;; Version: 1.0 +;; Package: ebnf2ps ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/ebnf-yac.el' --- lisp/progmodes/ebnf-yac.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/ebnf-yac.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: Vinicius Jose Latorre ;; Keywords: wp, ebnf, PostScript ;; Version: 1.4 +;; Package: ebnf2ps ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/idlw-help.el' --- lisp/progmodes/idlw-help.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/idlw-help.el 2010-08-29 16:17:13 +0000 @@ -6,7 +6,7 @@ ;; Authors: J.D. Smith ;; Carsten Dominik ;; Maintainer: J.D. Smith -;; Version: 6.1_em22 +;; Version: 6.1.22 ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/idlw-shell.el' --- lisp/progmodes/idlw-shell.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/idlw-shell.el 2010-08-29 16:17:13 +0000 @@ -7,7 +7,7 @@ ;; Carsten Dominik ;; Chris Chase ;; Maintainer: J.D. Smith -;; Version: 6.1_em22 +;; Version: 6.1.22 ;; Keywords: processes ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/idlw-toolbar.el' --- lisp/progmodes/idlw-toolbar.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/idlw-toolbar.el 2010-08-29 16:17:13 +0000 @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Maintainer: J.D. Smith -;; Version: 6.1_em22 +;; Version: 6.1.22 ;; Keywords: processes ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/idlwave.el' --- lisp/progmodes/idlwave.el 2010-07-10 18:52:53 +0000 +++ lisp/progmodes/idlwave.el 2010-08-29 16:17:13 +0000 @@ -7,7 +7,7 @@ ;; Carsten Dominik ;; Chris Chase ;; Maintainer: J.D. Smith -;; Version: 6.1_em22 +;; Version: 6.1.22 ;; Keywords: languages ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/js.el' --- lisp/progmodes/js.el 2010-08-26 20:09:31 +0000 +++ lisp/progmodes/js.el 2010-08-29 16:17:13 +0000 @@ -7,7 +7,7 @@ ;; Maintainer: Daniel Colascione ;; Version: 9 ;; Date: 2009-07-25 -;; Keywords: languages, oop, javascript +;; Keywords: languages, javascript ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/ps-mode.el' --- lisp/progmodes/ps-mode.el 2010-07-23 22:51:37 +0000 +++ lisp/progmodes/ps-mode.el 2010-08-29 16:17:13 +0000 @@ -6,7 +6,7 @@ ;; Author: Peter Kleiweg ;; Maintainer: Peter Kleiweg ;; Created: 20 Aug 1997 -;; Version: 1.1h, 16 Jun 2005 +;; Version: 1.1h ;; Keywords: PostScript, languages ;; Yoni Rabkin contacted the maintainer of this === modified file 'lisp/ps-bdf.el' --- lisp/ps-bdf.el 2010-01-13 08:35:10 +0000 +++ lisp/ps-bdf.el 2010-08-29 16:17:13 +0000 @@ -15,6 +15,7 @@ ;; Author: Kenichi Handa ;; (according to ack.texi) ;; Keywords: wp, BDF, font, PostScript +;; Package: ps-print ;; This file is part of GNU Emacs. === modified file 'lisp/ps-def.el' --- lisp/ps-def.el 2010-01-13 08:35:10 +0000 +++ lisp/ps-def.el 2010-08-29 16:17:13 +0000 @@ -8,6 +8,7 @@ ;; Vinicius Jose Latorre ;; Keywords: wp, print, PostScript ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre +;; Package: ps-print ;; This file is part of GNU Emacs. === modified file 'lisp/ps-mule.el' --- lisp/ps-mule.el 2010-01-13 08:35:10 +0000 +++ lisp/ps-mule.el 2010-08-29 16:17:13 +0000 @@ -8,6 +8,7 @@ ;; Maintainer: Kenichi Handa (multi-byte characters) ;; Vinicius Jose Latorre ;; Keywords: wp, print, PostScript, multibyte, mule +;; Package: ps-print ;; This file is part of GNU Emacs. === modified file 'lisp/ps-print.el' --- lisp/ps-print.el 2010-03-12 17:47:22 +0000 +++ lisp/ps-print.el 2010-08-29 16:17:13 +0000 @@ -13,6 +13,7 @@ ;; Keywords: wp, print, PostScript ;; Version: 7.3.5 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre +;; Package: ps-print (defconst ps-print-version "7.3.5" "ps-print.el, v 7.3.5 <2009/12/23 vinicius> @@ -6656,7 +6657,7 @@ ;; But autoload them here to make the separation invisible. ;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize -;;;;;; ps-multibyte-buffer) "ps-mule" "ps-mule.el" "9187df3473401876e0df4937c311fbaf") +;;;;;; ps-multibyte-buffer) "ps-mule" "ps-mule.el" "d2fcad95db7404989362657faf744796") ;;; Generated autoloads from ps-mule.el (defvar ps-multibyte-buffer nil "\ === modified file 'lisp/ps-samp.el' --- lisp/ps-samp.el 2010-01-13 08:35:10 +0000 +++ lisp/ps-samp.el 2010-08-29 16:17:13 +0000 @@ -10,6 +10,7 @@ ;; Vinicius Jose Latorre ;; Keywords: wp, print, PostScript ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre +;; Package: ps-print ;; This file is part of GNU Emacs. === modified file 'lisp/rect.el' --- lisp/rect.el 2010-01-13 08:35:10 +0000 +++ lisp/rect.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: Didier Verna ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/register.el' --- lisp/register.el 2010-01-13 08:35:10 +0000 +++ lisp/register.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/repeat.el' --- lisp/repeat.el 2010-01-13 08:35:10 +0000 +++ lisp/repeat.el 2010-08-29 16:17:13 +0000 @@ -5,7 +5,7 @@ ;; Author: Will Mengarini ;; Created: Mo 02 Mar 98 -;; Version: 0.51, We 13 May 98 +;; Version: 0.51 ;; Keywords: convenience, vi, repeat ;; This file is part of GNU Emacs. === modified file 'lisp/replace.el' --- lisp/replace.el 2010-08-08 21:12:29 +0000 +++ lisp/replace.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Free Software Foundation, Inc. ;; Maintainer: FSF +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/rfn-eshadow.el' --- lisp/rfn-eshadow.el 2010-01-13 08:35:10 +0000 +++ lisp/rfn-eshadow.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; ;; Author: Miles Bader ;; Keywords: convenience minibuffer +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/scroll-bar.el' --- lisp/scroll-bar.el 2010-05-05 03:45:21 +0000 +++ lisp/scroll-bar.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: hardware +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/simple.el' --- lisp/simple.el 2010-08-22 23:27:59 +0000 +++ lisp/simple.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Maintainer: FSF ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/startup.el' --- lisp/startup.el 2010-08-22 21:15:20 +0000 +++ lisp/startup.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Maintainer: FSF ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/subr.el' --- lisp/subr.el 2010-08-29 01:31:45 +0000 +++ lisp/subr.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/tabify.el' --- lisp/tabify.el 2010-01-13 08:35:10 +0000 +++ lisp/tabify.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Maintainer: FSF +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/textmodes/fill.el' --- lisp/textmodes/fill.el 2010-08-02 10:25:27 +0000 +++ lisp/textmodes/fill.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: wp +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/textmodes/page.el' --- lisp/textmodes/page.el 2010-01-13 08:35:10 +0000 +++ lisp/textmodes/page.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: wp convenience +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/textmodes/paragraphs.el' --- lisp/textmodes/paragraphs.el 2010-02-13 19:29:25 +0000 +++ lisp/textmodes/paragraphs.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Maintainer: FSF ;; Keywords: wp +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/textmodes/reftex-auc.el' --- lisp/textmodes/reftex-auc.el 2010-05-25 02:11:08 +0000 +++ lisp/textmodes/reftex-auc.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Carsten Dominik ;; Maintainer: auctex-devel@gnu.org ;; Version: 4.31 +;; Package: reftex ;; This file is part of GNU Emacs. === modified file 'lisp/textmodes/reftex-cite.el' --- lisp/textmodes/reftex-cite.el 2010-01-13 08:35:10 +0000 +++ lisp/textmodes/reftex-cite.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Carsten Dominik ;; Maintainer: auctex-devel@gnu.org ;; Version: 4.31 +;; Package: reftex ;; This file is part of GNU Emacs. === modified file 'lisp/textmodes/reftex-dcr.el' --- lisp/textmodes/reftex-dcr.el 2010-01-13 08:35:10 +0000 +++ lisp/textmodes/reftex-dcr.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Carsten Dominik ;; Maintainer: auctex-devel@gnu.org ;; Version: 4.31 +;; Package: reftex ;; This file is part of GNU Emacs. === modified file 'lisp/textmodes/reftex-global.el' --- lisp/textmodes/reftex-global.el 2010-01-13 08:35:10 +0000 +++ lisp/textmodes/reftex-global.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Carsten Dominik ;; Maintainer: auctex-devel@gnu.org ;; Version: 4.31 +;; Package: reftex ;; This file is part of GNU Emacs. === modified file 'lisp/textmodes/reftex-index.el' --- lisp/textmodes/reftex-index.el 2010-01-13 08:35:10 +0000 +++ lisp/textmodes/reftex-index.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Carsten Dominik ;; Maintainer: auctex-devel@gnu.org ;; Version: 4.31 +;; Package: reftex ;; This file is part of GNU Emacs. === modified file 'lisp/textmodes/reftex-parse.el' --- lisp/textmodes/reftex-parse.el 2010-01-13 08:35:10 +0000 +++ lisp/textmodes/reftex-parse.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Carsten Dominik ;; Maintainer: auctex-devel@gnu.org ;; Version: 4.31 +;; Package: reftex ;; This file is part of GNU Emacs. === modified file 'lisp/textmodes/reftex-ref.el' --- lisp/textmodes/reftex-ref.el 2010-01-13 08:35:10 +0000 +++ lisp/textmodes/reftex-ref.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Carsten Dominik ;; Maintainer: auctex-devel@gnu.org ;; Version: 4.31 +;; Package: reftex ;; This file is part of GNU Emacs. === modified file 'lisp/textmodes/reftex-sel.el' --- lisp/textmodes/reftex-sel.el 2010-01-13 08:35:10 +0000 +++ lisp/textmodes/reftex-sel.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Carsten Dominik ;; Maintainer: auctex-devel@gnu.org ;; Version: 4.31 +;; Package: reftex ;; This file is part of GNU Emacs. === modified file 'lisp/textmodes/reftex-toc.el' --- lisp/textmodes/reftex-toc.el 2010-02-28 01:22:44 +0000 +++ lisp/textmodes/reftex-toc.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Carsten Dominik ;; Maintainer: auctex-devel@gnu.org ;; Version: 4.31 +;; Package: reftex ;; This file is part of GNU Emacs. === modified file 'lisp/textmodes/reftex-vars.el' --- lisp/textmodes/reftex-vars.el 2010-03-22 16:50:29 +0000 +++ lisp/textmodes/reftex-vars.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Carsten Dominik ;; Maintainer: auctex-devel@gnu.org ;; Version: 4.31 +;; Package: reftex ;; This file is part of GNU Emacs. === modified file 'lisp/textmodes/text-mode.el' --- lisp/textmodes/text-mode.el 2010-03-12 17:47:22 +0000 +++ lisp/textmodes/text-mode.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Maintainer: FSF ;; Keywords: wp +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/tool-bar.el' --- lisp/tool-bar.el 2010-07-05 17:54:13 +0000 +++ lisp/tool-bar.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; ;; Author: Dave Love ;; Keywords: mouse frames +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/tooltip.el' --- lisp/tooltip.el 2010-01-13 08:35:10 +0000 +++ lisp/tooltip.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Gerd Moellmann ;; Keywords: help c mouse tools +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/tutorial.el' --- lisp/tutorial.el 2010-08-08 23:14:33 +0000 +++ lisp/tutorial.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; Maintainer: FSF ;; Keywords: help, internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/uniquify.el' --- lisp/uniquify.el 2010-03-12 17:47:22 +0000 +++ lisp/uniquify.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Maintainer: FSF ;; Keywords: files ;; Created: 15 May 86 +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/vc/ediff-diff.el' --- lisp/vc/ediff-diff.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/ediff-diff.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Michael Kifer +;; Package: ediff ;; This file is part of GNU Emacs. === modified file 'lisp/vc/ediff-help.el' --- lisp/vc/ediff-help.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/ediff-help.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Michael Kifer +;; Package: ediff ;; This file is part of GNU Emacs. === modified file 'lisp/vc/ediff-hook.el' --- lisp/vc/ediff-hook.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/ediff-hook.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Michael Kifer +;; Package: ediff ;; This file is part of GNU Emacs. === modified file 'lisp/vc/ediff-init.el' --- lisp/vc/ediff-init.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/ediff-init.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Michael Kifer +;; Package: ediff ;; This file is part of GNU Emacs. === modified file 'lisp/vc/ediff-merg.el' --- lisp/vc/ediff-merg.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/ediff-merg.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Michael Kifer +;; Package: ediff ;; This file is part of GNU Emacs. === modified file 'lisp/vc/ediff-mult.el' --- lisp/vc/ediff-mult.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/ediff-mult.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Michael Kifer +;; Package: ediff ;; This file is part of GNU Emacs. === modified file 'lisp/vc/ediff-ptch.el' --- lisp/vc/ediff-ptch.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/ediff-ptch.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Michael Kifer +;; Package: ediff ;; This file is part of GNU Emacs. === modified file 'lisp/vc/ediff-util.el' --- lisp/vc/ediff-util.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/ediff-util.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Michael Kifer +;; Package: ediff ;; This file is part of GNU Emacs. === modified file 'lisp/vc/ediff-vers.el' --- lisp/vc/ediff-vers.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/ediff-vers.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Michael Kifer +;; Package: ediff ;; This file is part of GNU Emacs. === modified file 'lisp/vc/ediff-wind.el' --- lisp/vc/ediff-wind.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/ediff-wind.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Michael Kifer +;; Package: ediff ;; This file is part of GNU Emacs. === modified file 'lisp/vc/pcvs-defs.el' --- lisp/vc/pcvs-defs.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/pcvs-defs.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Stefan Monnier ;; Keywords: pcl-cvs +;; Package: pcvs ;; This file is part of GNU Emacs. === modified file 'lisp/vc/pcvs-info.el' --- lisp/vc/pcvs-info.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/pcvs-info.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Stefan Monnier ;; Keywords: pcl-cvs +;; Package: pcvs ;; This file is part of GNU Emacs. === modified file 'lisp/vc/pcvs-parse.el' --- lisp/vc/pcvs-parse.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/pcvs-parse.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Stefan Monnier ;; Keywords: pcl-cvs +;; Package: pcvs ;; This file is part of GNU Emacs. === modified file 'lisp/vc/pcvs-util.el' --- lisp/vc/pcvs-util.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/pcvs-util.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Stefan Monnier ;; Keywords: pcl-cvs +;; Package: pcvs ;; This file is part of GNU Emacs. === modified file 'lisp/vc/vc-annotate.el' --- lisp/vc/vc-annotate.el 2010-07-10 18:52:53 +0000 +++ lisp/vc/vc-annotate.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Martin Lorentzson ;; Maintainer: FSF ;; Keywords: vc tools +;; Package: vc ;; This file is part of GNU Emacs. === modified file 'lisp/vc/vc-arch.el' --- lisp/vc/vc-arch.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/vc-arch.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Stefan Monnier +;; Package: vc ;; This file is part of GNU Emacs. === modified file 'lisp/vc/vc-bzr.el' --- lisp/vc/vc-bzr.el 2010-06-11 19:09:57 +0000 +++ lisp/vc/vc-bzr.el 2010-08-29 16:17:13 +0000 @@ -6,8 +6,9 @@ ;; Riccardo Murri ;; Keywords: vc tools ;; Created: Sept 2006 -;; Version: 2008-01-04 (Bzr revno 25) +;; Version: 2008-01-04 ;; URL: http://launchpad.net/vc-bzr +;; Package: vc ;; This file is part of GNU Emacs. === modified file 'lisp/vc/vc-cvs.el' --- lisp/vc/vc-cvs.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/vc-cvs.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel +;; Package: vc ;; This file is part of GNU Emacs. === modified file 'lisp/vc/vc-dav.el' --- lisp/vc/vc-dav.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/vc-dav.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Bill Perry ;; Maintainer: Bill Perry ;; Keywords: url, vc +;; Package: vc ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by === modified file 'lisp/vc/vc-dir.el' --- lisp/vc/vc-dir.el 2010-07-10 18:52:53 +0000 +++ lisp/vc/vc-dir.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Dan Nicolaescu ;; Keywords: vc tools +;; Package: vc ;; This file is part of GNU Emacs. === modified file 'lisp/vc/vc-dispatcher.el' --- lisp/vc/vc-dispatcher.el 2010-06-11 19:09:57 +0000 +++ lisp/vc/vc-dispatcher.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: FSF (see below for full credits) ;; Maintainer: Eric S. Raymond ;; Keywords: vc tools +;; Package: vc ;; This file is part of GNU Emacs. === modified file 'lisp/vc/vc-git.el' --- lisp/vc/vc-git.el 2010-07-10 18:52:53 +0000 +++ lisp/vc/vc-git.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; Author: Alexandre Julliard ;; Keywords: vc tools +;; Package: vc ;; This file is part of GNU Emacs. === modified file 'lisp/vc/vc-hg.el' --- lisp/vc/vc-hg.el 2010-06-11 19:09:57 +0000 +++ lisp/vc/vc-hg.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; Author: Ivan Kanis ;; Keywords: vc tools +;; Package: vc ;; This file is part of GNU Emacs. === modified file 'lisp/vc/vc-hooks.el' --- lisp/vc/vc-hooks.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/vc-hooks.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel +;; Package: vc ;; This file is part of GNU Emacs. === modified file 'lisp/vc/vc-mtn.el' --- lisp/vc/vc-mtn.el 2010-06-11 19:09:57 +0000 +++ lisp/vc/vc-mtn.el 2010-08-29 16:17:13 +0000 @@ -4,6 +4,7 @@ ;; Author: Stefan Monnier ;; Keywords: vc +;; Package: vc ;; This file is part of GNU Emacs. === modified file 'lisp/vc/vc-rcs.el' --- lisp/vc/vc-rcs.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/vc-rcs.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel +;; Package: vc ;; This file is part of GNU Emacs. === modified file 'lisp/vc/vc-sccs.el' --- lisp/vc/vc-sccs.el 2010-06-11 18:51:00 +0000 +++ lisp/vc/vc-sccs.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel +;; Package: vc ;; This file is part of GNU Emacs. === modified file 'lisp/vc/vc-svn.el' --- lisp/vc/vc-svn.el 2010-06-16 20:08:41 +0000 +++ lisp/vc/vc-svn.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Stefan Monnier +;; Package: vc ;; This file is part of GNU Emacs. === modified file 'lisp/version.el' --- lisp/version.el 2010-05-15 21:11:37 +0000 +++ lisp/version.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Maintainer: FSF ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/w32-fns.el' --- lisp/w32-fns.el 2010-06-26 12:08:49 +0000 +++ lisp/w32-fns.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Geoff Voelker ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/w32-vars.el' --- lisp/w32-vars.el 2010-01-13 08:35:10 +0000 +++ lisp/w32-vars.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; Author: Jason Rumney ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/wid-browse.el' --- lisp/wid-browse.el 2010-01-13 08:35:10 +0000 +++ lisp/wid-browse.el 2010-08-29 16:17:13 +0000 @@ -5,6 +5,7 @@ ;; ;; Author: Per Abrahamsen ;; Keywords: extensions +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/wid-edit.el' --- lisp/wid-edit.el 2010-07-10 18:52:53 +0000 +++ lisp/wid-edit.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Per Abrahamsen ;; Maintainer: FSF ;; Keywords: extensions +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/widget.el' --- lisp/widget.el 2010-01-13 08:35:10 +0000 +++ lisp/widget.el 2010-08-29 16:17:13 +0000 @@ -7,6 +7,7 @@ ;; Keywords: help, extensions, faces, hypermedia ;; Version: 1.9920 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/ +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/window.el' --- lisp/window.el 2010-06-07 18:28:02 +0000 +++ lisp/window.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Maintainer: FSF ;; Keywords: internal +;; Package: emacs ;; This file is part of GNU Emacs. === modified file 'lisp/woman.el' --- lisp/woman.el 2010-08-22 20:02:16 +0000 +++ lisp/woman.el 2010-08-29 16:17:13 +0000 @@ -7,7 +7,7 @@ ;; Maintainer: FSF ;; Keywords: help, unix ;; Adapted-By: Eli Zaretskii -;; Version: see `woman-version' +;; Version: 0.551 ;; URL: http://centaur.maths.qmul.ac.uk/Emacs/WoMan/ ;; This file is part of GNU Emacs. === modified file 'lisp/x-dnd.el' --- lisp/x-dnd.el 2010-06-22 07:10:16 +0000 +++ lisp/x-dnd.el 2010-08-29 16:17:13 +0000 @@ -6,6 +6,7 @@ ;; Author: Jan Djärv ;; Maintainer: FSF ;; Keywords: window, drag, drop +;; Package: emacs ;; This file is part of GNU Emacs. ------------------------------------------------------------ revno: 101204 committer: Jan D branch nick: trunk timestamp: Sun 2010-08-29 12:30:45 +0200 message: * nsterm.m (ns_draw_window_cursor): Draw BAR_CURSOR correct for R2L. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-08-26 00:47:34 +0000 +++ src/ChangeLog 2010-08-29 10:30:45 +0000 @@ -1,3 +1,7 @@ +2010-08-29 Jan Djärv + + * nsterm.m (ns_draw_window_cursor): Draw BAR_CURSOR correct for R2L. + 2010-08-26 Kenichi Handa * xdisp.c (compute_stop_pos): Pay attention to bidi scan direction === modified file 'src/nsterm.m' --- src/nsterm.m 2010-08-18 08:06:45 +0000 +++ src/nsterm.m 2010-08-29 10:30:45 +0000 @@ -2251,6 +2251,11 @@ struct frame *f = WINDOW_XFRAME (w); struct glyph *phys_cursor_glyph; int overspill; + struct glyph *cursor_glyph; + + /* If cursor is out of bounds, don't draw garbage. This can happen + in mini-buffer windows when switching between echo area glyphs + and mini-buffer. */ NSTRACE (dumpcursor); //fprintf(stderr, "drawcursor (%d,%d) activep = %d\tonp = %d\tc_type = %d\twidth = %d\n",x,y, active_p,on_p,cursor_type,cursor_width); @@ -2328,6 +2333,13 @@ case BAR_CURSOR: s = r; s.size.width = min (cursor_width, 2); //FIXME(see above) + + /* If the character under cursor is R2L, draw the bar cursor + on the right of its glyph, rather than on the left. */ + cursor_glyph = get_phys_cursor_glyph (w); + if ((cursor_glyph->resolved_level & 1) != 0) + s.origin.x += cursor_glyph->pixel_width - s.size.width; + NSRectFill (s); break; } ------------------------------------------------------------ revno: 101203 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-08-28 21:31:45 -0400 message: Let version-to-list handle versions like "10.3d". * lisp/subr.el (version-regexp-alist): Don't use "a" and "b" for "alpha" and "beta". (version-to-list): Handle versions like "10.3d". diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-08-28 18:52:36 +0000 +++ lisp/ChangeLog 2010-08-29 01:31:45 +0000 @@ -1,3 +1,9 @@ +2010-08-29 Chong Yidong + + * subr.el (version-regexp-alist): Don't use "a" and "b" for + "alpha" and "beta". + (version-to-list): Handle versions like "10.3d". + 2010-08-28 Stefan Monnier * emacs-lisp/macroexp.el (macroexpand-all-1): Use pcase. === modified file 'lisp/subr.el' --- lisp/subr.el 2010-08-22 20:02:16 +0000 +++ lisp/subr.el 2010-08-29 01:31:45 +0000 @@ -3584,11 +3584,11 @@ (defconst version-regexp-alist - '(("^[-_+ ]?a\\(lpha\\)?$" . -3) + '(("^[-_+ ]?alpha$" . -3) ("^[-_+]$" . -3) ; treat "1.2.3-20050920" and "1.2-3" as alpha releases ("^[-_+ ]cvs$" . -3) ; treat "1.2.3-CVS" as alpha release - ("^[-_+ ]?b\\(eta\\)?$" . -2) - ("^[-_+ ]?\\(pre\\|rc\\)$" . -1)) + ("^[-_+ ]?beta$" . -2) + ("^[-_+ ]?\\(pre\\|rcc\\)$" . -1)) "*Specify association between non-numeric version and its priority. This association is used to handle version string like \"1.0pre2\", @@ -3681,8 +3681,13 @@ (setq al version-regexp-alist) (while (and al (not (string-match (caar al) s))) (setq al (cdr al))) - (or al (error "Invalid version syntax: '%s'" ver)) - (setq lst (cons (cdar al) lst))))) + (cond (al + (push (cdar al) lst)) + ;; Convert 22.3a to 22.3.1. + ((string-match "^[-_+ ]?\\([a-zA-Z]\\)$" s) + (push (- (aref (downcase (match-string 1 s)) 0) ?a -1) + lst)) + (t (error "Invalid version syntax: '%s'" ver)))))) (if (null lst) (error "Invalid version syntax: '%s'" ver) (nreverse lst))))) ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.