# HG changeset patch # User Miles Bader # Date 1184032955 0 # Node ID cd3e38bb3dc7e640ccab2d12fac394f013c9709c # Parent 6306681bf3b4e79633c60370503f537c5e67a469# Parent 1d4e3c3b371a58f9c530ff49575b4f735cebd3ba Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (patch 51-54) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 233-234) - Merge from emacs--devo--0 - Update from CVS 2007-07-08 Katsumi Yamaoka * lisp/cus-start.el (file-coding-system-alist): Fix custom type. 2007-07-08 Chong Yidong * lisp/longlines.el (longlines-wrap-region): Avoid marking buffer as modified. (longlines-auto-wrap, longlines-window-change-function): Remove unnecessary calls to set-buffer-modified-p. 2007-07-03 Dan Nicolaescu * lisp/progmodes/gud.el (auto-mode-alist): Match more valid gdb init file names. 2007-07-01 Richard Stallman * lisp/files.el (find-file-visit-truename): Fix safe-local-variable value. 2007-07-04 Katsumi Yamaoka * lisp/gnus/gnus-sum.el (gnus-summary-catchup): Don't recognize cached articles as unfetched articles. 2007-07-02 Reiner Steib * lisp/gnus/gnus-start.el (gnus-level-unsubscribed): Improve doc string. 2007-06-26 Katsumi Yamaoka * lisp/gnus/gnus-art.el (gnus-article-summary-command-nosave) (gnus-article-read-summary-keys): Don't set the 3rd arg of pop-to-buffer for XEmacs. 2007-07-02 Reiner Steib * man/gnus-faq.texi ([3.2]): Fix locating of environment variables in the Control Panel. * man/gnus.texi (Misc Article): Add index entry for gnus-single-article-buffer. 2007-06-27 Andreas Seltenreich * man/gnus.texi (Starting Up): Fix typo. 2007-06-25 Katsumi Yamaoka * man/gnus.texi (Asynchronous Fetching): Fix typo. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-806 diff -r 6306681bf3b4 -r cd3e38bb3dc7 etc/NEWS.22 --- a/etc/NEWS.22 Mon Jul 09 20:49:25 2007 +0000 +++ b/etc/NEWS.22 Tue Jul 10 02:02:35 2007 +0000 @@ -46,6 +46,11 @@ than the window, the usual keys for moving the cursor cause the image to be scrolled horizontally or vertically instead. +** Scrollbars follow the system theme on Windows XP and later. +Windows XP introduced themed scrollbars, but applications have to take +special steps to use them. Emacs now has the appropriate resources linked +in to make it use the scrollbars from the system theme. + * New Modes and Packages in Emacs 22.2 ** The new package css-mode.el provides a major mode for editing CSS files. diff -r 6306681bf3b4 -r cd3e38bb3dc7 lisp/ChangeLog --- a/lisp/ChangeLog Mon Jul 09 20:49:25 2007 +0000 +++ b/lisp/ChangeLog Tue Jul 10 02:02:35 2007 +0000 @@ -1,3 +1,14 @@ +2007-07-08 Katsumi Yamaoka + + * cus-start.el (file-coding-system-alist): Fix custom type. + +2007-07-08 Chong Yidong + + * longlines.el (longlines-wrap-region): Avoid marking buffer as + modified. + (longlines-auto-wrap, longlines-window-change-function): Remove + unnecessary calls to set-buffer-modified-p. + 2007-07-09 Reiner Steib * textmodes/tex-mode.el (tex-fontify-script) @@ -249,6 +260,11 @@ * calculator.el (calculator-expt): Use more cases to determine the value. +2007-07-03 Dan Nicolaescu + + * progmodes/gud.el (auto-mode-alist): Match more valid gdb init + file names. + 2007-07-03 Jay Belanger * calculator.el (calculator-expt, calculator-integer-p): @@ -332,6 +348,10 @@ 2007-07-01 Richard Stallman + * files.el (find-file-visit-truename): Fix safe-local-variable value. + +2007-07-01 Richard Stallman + * cus-start.el (max-mini-window-height): Added. 2007-07-01 Sean O'Rourke (tiny change) @@ -981,7 +1001,7 @@ post-command-hook. (rcirc-window-configuration-change-1): Update mode-line and overlay arrows here. - (rcirc-authenticate): Fix chanserv identification. + (rcirc-authenticate): Fixc hanserv identification. (rcirc-default-server): Remove variable. (rcirc): Connect according to rcirc-connections. (rcirc-connections): Add variable. diff -r 6306681bf3b4 -r cd3e38bb3dc7 lisp/ChangeLog.12 --- a/lisp/ChangeLog.12 Mon Jul 09 20:49:25 2007 +0000 +++ b/lisp/ChangeLog.12 Tue Jul 10 02:02:35 2007 +0000 @@ -1092,8 +1092,8 @@ North American rule. Replace "daylight savings" with "daylight saving" in doc. - * calendar/cal-china.el,cal-dst.el,calendar.el,diary-lib.el: - * calendar/lunar.el,solar.el: Replace "daylight savings" with + * calendar/cal-china.el, cal-dst.el, calendar.el, diary-lib.el: + * calendar/lunar.el, solar.el: Replace "daylight savings" with "daylight saving" in text. * woman.el (woman-change-fonts): Tweak previous change by using diff -r 6306681bf3b4 -r cd3e38bb3dc7 lisp/files.el --- a/lisp/files.el Mon Jul 09 20:49:25 2007 +0000 +++ b/lisp/files.el Tue Jul 10 02:02:35 2007 +0000 @@ -162,7 +162,7 @@ both at the file level and at the levels of the containing directories." :type 'boolean :group 'find-file) -(put 'find-file-visit-truename 'safe-local-variable 'boolean) +(put 'find-file-visit-truename 'safe-local-variable 'booleanp) (defcustom revert-without-query nil "Specify which files should be reverted without query. diff -r 6306681bf3b4 -r cd3e38bb3dc7 lisp/gnus/ChangeLog --- a/lisp/gnus/ChangeLog Mon Jul 09 20:49:25 2007 +0000 +++ b/lisp/gnus/ChangeLog Tue Jul 10 02:02:35 2007 +0000 @@ -1,3 +1,18 @@ +2007-07-04 Katsumi Yamaoka + + * gnus-sum.el (gnus-summary-catchup): Don't recognize cached articles + as unfetched articles. + +2007-07-02 Reiner Steib + + * gnus-start.el (gnus-level-unsubscribed): Improve doc string. + +2007-06-26 Katsumi Yamaoka + + * gnus-art.el (gnus-article-summary-command-nosave) + (gnus-article-read-summary-keys): Don't set the 3rd arg of + pop-to-buffer for XEmacs. + 2007-06-14 Katsumi Yamaoka * gnus-agent.el (gnus-agent-fetch-headers) diff -r 6306681bf3b4 -r cd3e38bb3dc7 lisp/gnus/gnus-art.el --- a/lisp/gnus/gnus-art.el Mon Jul 09 20:49:25 2007 +0000 +++ b/lisp/gnus/gnus-art.el Tue Jul 10 02:02:35 2007 +0000 @@ -5607,7 +5607,7 @@ "Execute the last keystroke in the summary buffer." (interactive) (let (func) - (pop-to-buffer gnus-article-current-summary nil 'norecord) + (pop-to-buffer gnus-article-current-summary nil (not (featurep 'xemacs))) (setq func (lookup-key (current-local-map) (this-command-keys))) (call-interactively func))) @@ -5646,7 +5646,8 @@ (member keys nosave-in-article)) (let (func) (save-window-excursion - (pop-to-buffer gnus-article-current-summary nil 'norecord) + (pop-to-buffer gnus-article-current-summary + nil (not (featurep 'xemacs))) ;; We disable the pick minor mode commands. (let (gnus-pick-mode) (setq func (lookup-key (current-local-map) keys)))) @@ -5658,14 +5659,16 @@ (call-interactively func) (setq new-sum-point (point))) (when (member keys nosave-but-article) - (pop-to-buffer gnus-article-buffer nil 'norecord))) + (pop-to-buffer gnus-article-buffer + nil (not (featurep 'xemacs))))) ;; These commands should restore window configuration. (let ((obuf (current-buffer)) (owin (current-window-configuration)) (opoint (point)) win func in-buffer selected new-sum-start new-sum-hscroll) (cond (not-restore-window - (pop-to-buffer gnus-article-current-summary nil 'norecord)) + (pop-to-buffer gnus-article-current-summary + nil (not (featurep 'xemacs)))) ((setq win (get-buffer-window gnus-article-current-summary)) (select-window win)) (t diff -r 6306681bf3b4 -r cd3e38bb3dc7 lisp/gnus/gnus-start.el --- a/lisp/gnus/gnus-start.el Mon Jul 09 20:49:25 2007 +0000 +++ b/lisp/gnus/gnus-start.el Tue Jul 10 02:02:35 2007 +0000 @@ -178,8 +178,13 @@ (defconst gnus-level-unsubscribed 7 "Groups with levels less than or equal to this variable are unsubscribed. -Groups with levels less than `gnus-level-subscribed', which should be -less than this variable, are subscribed.") + +Groups with levels less than `gnus-level-subscribed', which +should be less than this variable, are subscribed. Groups with +levels from `gnus-level-subscribed' (exclusive) upto this +variable (inclusive) are unsubscribed. See also +`gnus-level-zombie', `gnus-level-killed' and the Info node `Group +Levels' for details.") (defconst gnus-level-zombie 8 "Groups with this level are zombie groups.") diff -r 6306681bf3b4 -r cd3e38bb3dc7 lisp/gnus/gnus-sum.el --- a/lisp/gnus/gnus-sum.el Mon Jul 09 20:49:25 2007 +0000 +++ b/lisp/gnus/gnus-sum.el Tue Jul 10 02:02:35 2007 +0000 @@ -10514,7 +10514,8 @@ (gnus-sorted-nunion (gnus-sorted-intersection gnus-newsgroup-unreads gnus-newsgroup-downloadable) - gnus-newsgroup-unfetched))) + (gnus-sorted-difference gnus-newsgroup-unfetched + gnus-newsgroup-cached)))) ;; We actually mark all articles as canceled, which we ;; have to do when using auto-expiry or adaptive scoring. (gnus-summary-show-all-threads) diff -r 6306681bf3b4 -r cd3e38bb3dc7 lisp/progmodes/gud.el --- a/lisp/progmodes/gud.el Mon Jul 09 20:49:25 2007 +0000 +++ b/lisp/progmodes/gud.el Tue Jul 10 02:02:35 2007 +0000 @@ -3193,8 +3193,12 @@ (goto-char (point-max))) t) +;; Besides .gdbinit, gdb documents other names to be usable for init +;; files, cross-debuggers can use something like +;; .PROCESSORNAME-gdbinit so that the host and target gdbinit files +;; don't interfere with each other. ;;;###autoload -(add-to-list 'auto-mode-alist '("/\\.gdbinit" . gdb-script-mode)) +(add-to-list 'auto-mode-alist '("/\\.[a-z0-9-]*gdbinit" . gdb-script-mode)) ;;;###autoload (define-derived-mode gdb-script-mode nil "GDB-Script" diff -r 6306681bf3b4 -r cd3e38bb3dc7 man/ChangeLog --- a/man/ChangeLog Mon Jul 09 20:49:25 2007 +0000 +++ b/man/ChangeLog Tue Jul 10 02:02:35 2007 +0000 @@ -7,6 +7,22 @@ * org.texi (Properties): New chapter. +2007-07-02 Reiner Steib + + * gnus-faq.texi ([3.2]): Fix locating of environment variables in the + Control Panel. + + * gnus.texi (Misc Article): Add index entry for + gnus-single-article-buffer. + +2007-06-27 Andreas Seltenreich + + * gnus.texi (Starting Up): Fix typo. + +2007-06-25 Katsumi Yamaoka + + * gnus.texi (Asynchronous Fetching): Fix typo. + 2007-06-24 Karl Berry * emacs.texi: new Back-Cover Text. diff -r 6306681bf3b4 -r cd3e38bb3dc7 man/gnus-faq.texi --- a/man/gnus-faq.texi Mon Jul 09 20:49:25 2007 +0000 +++ b/man/gnus-faq.texi Tue Jul 10 02:02:35 2007 +0000 @@ -427,12 +427,11 @@ @end example @noindent -in your autoexec.bat and reboot. Under NT, 2000 and XP, -hit Winkey+Pause/Break to enter system options (if it -doesn't work, go to Control Panel -> System). There you'll -find the possibility to set environment variables, create -a new one with name HOME and value C:\myhome, a reboot is -not necessary. +in your autoexec.bat and reboot. Under NT, 2000 and XP, hit +Winkey+Pause/Break to enter system options (if it doesn't work, go to +Control Panel -> System -> Advanced). There you'll find the possibility +to set environment variables. Create a new one with name HOME and value +C:\myhome. Rebooting is not necessary. Now to create ~/.gnus.el, say @samp{C-x C-f ~/.gnus.el RET C-x C-s}. diff -r 6306681bf3b4 -r cd3e38bb3dc7 man/gnus.texi --- a/man/gnus.texi Mon Jul 09 20:49:25 2007 +0000 +++ b/man/gnus.texi Tue Jul 10 02:02:35 2007 +0000 @@ -947,8 +947,8 @@ @chapter Starting Gnus @cindex starting up -If you are haven't used Emacs much before using Gnus, read @ref{Emacs -for Heathens} first. +If you haven't used Emacs much before using Gnus, read @ref{Emacs for +Heathens} first. @kindex M-x gnus @findex gnus @@ -7173,12 +7173,12 @@ @code{nil}, no pre-fetching will be done. @vindex gnus-async-prefetch-article-p -@findex gnus-async-read-p +@findex gnus-async-unread-p There are probably some articles that you don't want to pre-fetch---read articles, for instance. The @code{gnus-async-prefetch-article-p} variable controls whether an article is to be pre-fetched. This function should return non-@code{nil} when the article in question is -to be pre-fetched. The default is @code{gnus-async-read-p}, which +to be pre-fetched. The default is @code{gnus-async-unread-p}, which returns @code{nil} on read articles. The function is called with an article data structure as the only parameter. @@ -11504,6 +11504,7 @@ @item gnus-single-article-buffer @vindex gnus-single-article-buffer +@cindex article buffers, several If non-@code{nil}, use the same article buffer for all the groups. (This is the default.) If @code{nil}, each group will have its own article buffer. @@ -13509,14 +13510,18 @@ @code{nnmail-split-header-length-limit} are excluded from the split function. +@vindex nnmail-mail-splitting-decodes @vindex nnmail-mail-splitting-charset -@vindex nnmail-mail-splitting-decodes -By default, splitting @acronym{MIME}-decodes headers so you -can match on non-@acronym{ASCII} strings. The -@code{nnmail-mail-splitting-charset} variable specifies the default -charset for decoding. The behavior can be turned off completely by -binding @code{nnmail-mail-splitting-decodes} to @code{nil}, which is -useful if you want to match articles based on the raw header data. +By default, splitting does not decode headers, so you can not match on +non-@acronym{ASCII} strings. But it is useful if you want to match +articles based on the raw header data. To enable it, set the +@code{nnmail-mail-splitting-decodes} variable to a non-@code{nil} value. +In addition, the value of the @code{nnmail-mail-splitting-charset} +variable is used for decoding non-@acronym{MIME} encoded string when +@code{nnmail-mail-splitting-decodes} is non-@code{nil}. The default +value is @code{nil} which means not to decode non-@acronym{MIME} encoded +string. A suitable value for you will be @code{undecided} or be the +charset used normally in mails you are interested in. @vindex nnmail-resplit-incoming By default, splitting is performed on all incoming messages. If you diff -r 6306681bf3b4 -r cd3e38bb3dc7 man/texinfo.tex --- a/man/texinfo.tex Mon Jul 09 20:49:25 2007 +0000 +++ b/man/texinfo.tex Tue Jul 10 02:02:35 2007 +0000 @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2007-06-16.10} +\def\texinfoversion{2007-07-09.21} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -7434,22 +7434,41 @@ % @documentlanguage is usually given very early, just after % @setfilename. If done too late, it may not override everything -% properly. Single argument is the language abbreviation. -% It would be nice if we could set up a hyphenation file here. -% -\parseargdef\documentlanguage{% +% properly. Single argument is the language (de) or locale (de_DE) +% abbreviation. It would be nice if we could set up a hyphenation file. +% +{ + \catcode`\_ = \active + \globaldefs=1 +\parseargdef\documentlanguage{\begingroup + \let_=\normalunderscore % normal _ character for filenames \tex % read txi-??.tex file in plain TeX. - % Read the file if it exists. + % Read the file by the name they passed if it exists. \openin 1 txi-#1.tex \ifeof 1 - \errhelp = \nolanghelp - \errmessage{Cannot read language file txi-#1.tex}% + \documentlanguagetrywithoutunderscore{#1_\finish}% \else \input txi-#1.tex \fi \closein 1 \endgroup -} +\endgroup} +} +% +% If they passed de_DE, and txi-de_DE.tex doesn't exist, +% try txi-de.tex. +% +\def\documentlanguagetrywithoutunderscore#1_#2\finish{% + \openin 1 txi-#1.tex + \ifeof 1 + \errhelp = \nolanghelp + \errmessage{Cannot read language file txi-#1.tex}% + \else + \input txi-#1.tex + \fi + \closein 1 +} +% \newhelp\nolanghelp{The given language definition file cannot be found or is empty. Maybe you need to install it? In the current directory should work if nowhere else does.} @@ -8316,6 +8335,8 @@ \ifpdf \pdfpageheight #7\relax \pdfpagewidth #8\relax + \pdfhorigin = 1 true in + \pdfvorigin = 1 true in \fi % \setleading{\textleading}