Now on revision 106505. ------------------------------------------------------------ revno: 106505 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-11-23 23:44:51 -0800 message: Fix case of "GnuTLS" in docs. * doc/misc/gnus.texi, doc/misc/smtpmail.texi: * etc/NEWS: * lisp/gnus/starttls.el, lisp/net/tls.el: Fix case of "GnuTLS". diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-11-24 02:22:09 +0000 +++ doc/misc/ChangeLog 2011-11-24 07:44:51 +0000 @@ -1,3 +1,7 @@ +2011-11-24 Glenn Morris + + * gnus.texi, smtpmail.texi: Fix case of "GnuTLS". + 2011-11-24 Juanma Barranquero * makefile.w32-in: Update dependencies. === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2011-11-23 07:03:56 +0000 +++ doc/misc/gnus.texi 2011-11-24 07:44:51 +0000 @@ -13761,7 +13761,7 @@ @findex nntp-open-tls-stream @item nntp-open-tls-stream Opens a connection to a server over a @dfn{secure} channel. To use -this you must have @uref{http://www.gnu.org/software/gnutls/, GNUTLS} +this you must have @uref{http://www.gnu.org/software/gnutls/, GnuTLS} installed. You then define a server as follows: @lisp @@ -27801,7 +27801,7 @@ @acronym{TLS} wrapper shipped with Gnus @acronym{TLS}/@acronym{SSL} is now supported in @acronym{IMAP} and -@acronym{NNTP} via @file{tls.el} and GNUTLS. +@acronym{NNTP} via @file{tls.el} and GnuTLS. @item Improved anti-spam features. === modified file 'doc/misc/smtpmail.texi' --- doc/misc/smtpmail.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/smtpmail.texi 2011-11-24 07:44:51 +0000 @@ -233,7 +233,7 @@ @enumerate @item -The GNUTLS command line tool @samp{gnutls-cli}, you can get it from +The GnuTLS command line tool @samp{gnutls-cli}, you can get it from @url{http://www.gnu.org/software/gnutls/}. This is the recommended tool, mainly because it can verify the server certificates. === modified file 'etc/NEWS.22' --- etc/NEWS.22 2011-11-23 07:03:56 +0000 +++ etc/NEWS.22 2011-11-24 07:44:51 +0000 @@ -2558,10 +2558,10 @@ *** Minor Improvements -**** The STARTTLS wrapper (starttls.el) can now use GNUTLS +**** The STARTTLS wrapper (starttls.el) can now use GnuTLS instead of the OpenSSL based `starttls' tool. For backwards compatibility, it prefers `starttls', but you can toggle -`starttls-use-gnutls' to switch to GNUTLS (or simply remove the +`starttls-use-gnutls' to switch to GnuTLS (or simply remove the `starttls' tool). **** Do not allow debugger output history variable to grow without bounds. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-24 07:32:40 +0000 +++ lisp/ChangeLog 2011-11-24 07:44:51 +0000 @@ -1,5 +1,7 @@ 2011-11-24 Glenn Morris + * net/tls.el: Fix case of "GnuTLS". + * paths.el (rmail-file-name): Format doc-string for make-docfile. * version.el (emacs-build-system): Give it a doc-string. === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-11-24 01:58:14 +0000 +++ lisp/gnus/ChangeLog 2011-11-24 07:44:51 +0000 @@ -1,3 +1,7 @@ +2011-11-24 Glenn Morris + + * starttls.el: Fix case of "GnuTLS". + 2011-11-24 Juanma Barranquero * gnus-group.el (gnus-group-highlight): Fix typo. === modified file 'lisp/gnus/starttls.el' --- lisp/gnus/starttls.el 2011-08-20 00:20:39 +0000 +++ lisp/gnus/starttls.el 2011-11-24 07:44:51 +0000 @@ -5,7 +5,7 @@ ;; Author: Daiki Ueno ;; Author: Simon Josefsson ;; Created: 1999/11/20 -;; Keywords: TLS, SSL, OpenSSL, GNUTLS, mail, news +;; Keywords: TLS, SSL, OpenSSL, GnuTLS, mail, news ;; This file is part of GNU Emacs. @@ -33,15 +33,15 @@ ;; implementations both called "starttls.el". The first one is Daiki ;; Ueno's starttls.el which uses his own "starttls" command line tool, ;; and the second one is Simon Josefsson's starttls.el which uses -;; "gnutls-cli" from GNUTLS. +;; "gnutls-cli" from GnuTLS. ;; ;; If "starttls" is available, it is prefered by the code over ;; "gnutls-cli", for backwards compatibility. Use ;; `starttls-use-gnutls' to toggle between implementations if you have -;; both tools installed. It is recommended to use GNUTLS, though, as +;; both tools installed. It is recommended to use GnuTLS, though, as ;; it performs more verification of the certificates. -;; The GNUTLS support requires GNUTLS 0.9.90 (released 2003-10-08) or +;; The GnuTLS support requires GnuTLS 0.9.90 (released 2003-10-08) or ;; later, from , or "starttls" ;; from . @@ -121,8 +121,8 @@ :group 'mail) (defcustom starttls-gnutls-program "gnutls-cli" - "Name of GNUTLS command line tool. -This program is used when GNUTLS is used, i.e. when + "Name of GnuTLS command line tool. +This program is used when GnuTLS is used, i.e. when `starttls-use-gnutls' is non-nil." :version "22.1" :type 'string @@ -136,7 +136,7 @@ :group 'starttls) (defcustom starttls-use-gnutls (not (executable-find starttls-program)) - "*Whether to use GNUTLS instead of the `starttls' command." + "*Whether to use GnuTLS instead of the `starttls' command." :version "22.1" :type 'boolean :group 'starttls) @@ -150,7 +150,7 @@ (defcustom starttls-extra-arguments nil "Extra arguments to `starttls-program'. -These apply when GNUTLS is used, i.e. when `starttls-use-gnutls' is non-nil. +These apply when GnuTLS is used, i.e. when `starttls-use-gnutls' is non-nil. For example, non-TLS compliant servers may require '(\"--protocols\" \"ssl3\"). Invoke \"gnutls-cli --help\" to @@ -167,8 +167,8 @@ (defcustom starttls-connect "- Simple Client Mode:\n\n" "*Regular expression indicating successful connection. -The default is what GNUTLS's \"gnutls-cli\" outputs." - ;; GNUTLS cli.c:main() prints this string when it is starting to run +The default is what GnuTLS's \"gnutls-cli\" outputs." + ;; GnuTLS cli.c:main() prints this string when it is starting to run ;; in the application read/write phase. If the logic, or the string ;; itself, is modified, this must be updated. :version "22.1" @@ -177,8 +177,8 @@ (defcustom starttls-failure "\\*\\*\\* Handshake has failed" "*Regular expression indicating failed TLS handshake. -The default is what GNUTLS's \"gnutls-cli\" outputs." - ;; GNUTLS cli.c:do_handshake() prints this string on failure. If the +The default is what GnuTLS's \"gnutls-cli\" outputs." + ;; GnuTLS cli.c:do_handshake() prints this string on failure. If the ;; logic, or the string itself, is modified, this must be updated. :version "22.1" :type 'regexp @@ -186,8 +186,8 @@ (defcustom starttls-success "- Compression: " "*Regular expression indicating completed TLS handshakes. -The default is what GNUTLS's \"gnutls-cli\" outputs." - ;; GNUTLS cli.c:do_handshake() calls, on success, +The default is what GnuTLS's \"gnutls-cli\" outputs." + ;; GnuTLS cli.c:do_handshake() calls, on success, ;; common.c:print_info(), that unconditionally print this string ;; last. If that logic, or the string itself, is modified, this ;; must be updated. @@ -283,7 +283,7 @@ Third arg is name of the host to connect to, or its IP address. Fourth arg PORT is an integer specifying a port to connect to. If `starttls-use-gnutls' is nil, this may also be a service name, but -GNUTLS requires a port number." +GnuTLS requires a port number." (if starttls-use-gnutls (starttls-open-stream-gnutls name buffer host port) (message "Opening STARTTLS connection to `%s:%s'" host (format "%s" port)) === modified file 'lisp/net/tls.el' --- lisp/net/tls.el 2011-01-25 04:08:28 +0000 +++ lisp/net/tls.el 2011-11-24 07:44:51 +0000 @@ -123,7 +123,7 @@ (defcustom tls-success "- Handshake was completed\\|SSL handshake has read " "Regular expression indicating completed TLS handshakes. -The default is what GNUTLS's \"gnutls-cli\" or OpenSSL's +The default is what GnuTLS's \"gnutls-cli\" or OpenSSL's \"openssl s_client\" outputs." :version "22.1" :type 'regexp @@ -150,7 +150,7 @@ (defcustom tls-untrusted "- Peer's certificate is NOT trusted\\|Verify return code: \\([^0] \\|.[^ ]\\)" "Regular expression indicating failure of TLS certificate verification. -The default is what GNUTLS's \"gnutls-cli\" or OpenSSL's +The default is what GnuTLS's \"gnutls-cli\" or OpenSSL's \"openssl s_client\" return in the event of unsuccessful verification." :type 'regexp ------------------------------------------------------------ revno: 106504 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-11-23 23:32:40 -0800 message: * lib-src/make-docfile.c (scan_lisp_file): Treat defcustom like defvar. * lisp/paths.el (rmail-file-name): Format doc-string for make-docfile. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2011-11-20 02:29:42 +0000 +++ lib-src/ChangeLog 2011-11-24 07:32:40 +0000 @@ -1,3 +1,7 @@ +2011-11-24 Glenn Morris + + * make-docfile.c (scan_lisp_file): Treat defcustom like defvar. + 2011-11-14 Dan Nicolaescu * Makefile.in (all): Make sure "all" is the first target. === modified file 'lib-src/make-docfile.c' --- lib-src/make-docfile.c 2011-05-28 22:39:39 +0000 +++ lib-src/make-docfile.c 2011-11-24 07:32:40 +0000 @@ -1149,8 +1149,10 @@ } } + /* defcustom can only occur in uncompiled Lisp files. */ else if (! strcmp (buffer, "defvar") - || ! strcmp (buffer, "defconst")) + || ! strcmp (buffer, "defconst") + || ! strcmp (buffer, "defcustom")) { char c1 = 0, c2 = 0; type = 'V'; === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-24 07:24:31 +0000 +++ lisp/ChangeLog 2011-11-24 07:32:40 +0000 @@ -1,5 +1,7 @@ 2011-11-24 Glenn Morris + * paths.el (rmail-file-name): Format doc-string for make-docfile. + * version.el (emacs-build-system): Give it a doc-string. 2011-11-24 Juri Linkov === modified file 'lisp/paths.el' --- lisp/paths.el 2011-11-23 08:48:07 +0000 +++ lisp/paths.el 2011-11-24 07:32:40 +0000 @@ -132,12 +132,8 @@ *The name of your organization, as a string. The `ORGANIZATION' environment variable is used instead if defined.") -;; This is a defcustom, which make-docfile does not recognize in -;; uncompiled Lisp code. If we use the "\ method of writing the doc, -;; it does not get a doc string. Somehow if we write it in the "wrong" -;; (ie normal) way (as below), it does... See also remote-shell-program. -(defcustom rmail-file-name (purecopy "~/RMAIL") - "Name of user's primary mail file." +(defcustom rmail-file-name (purecopy "~/RMAIL") "\ +Name of user's primary mail file." :type 'string :group 'rmail :version "21.1") ------------------------------------------------------------ revno: 106503 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-11-23 23:24:31 -0800 message: * lisp/version.el (emacs-build-system): Give it a doc-string. Consolidate local variables at the end of the file. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-24 07:09:56 +0000 +++ lisp/ChangeLog 2011-11-24 07:24:31 +0000 @@ -1,3 +1,7 @@ +2011-11-24 Glenn Morris + + * version.el (emacs-build-system): Give it a doc-string. + 2011-11-24 Juri Linkov * view.el (view-buffer): Revert revno:105285 from 2011-07-19 (bug#8615). === modified file 'lisp/version.el' --- lisp/version.el 2011-03-12 19:19:47 +0000 +++ lisp/version.el 2011-11-24 07:24:31 +0000 @@ -1,4 +1,4 @@ -;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*- +;;; version.el --- record version number of Emacs ;; Copyright (C) 1985, 1992, 1994-1995, 1999-2011 ;; Free Software Foundation, Inc. @@ -40,7 +40,8 @@ (defconst emacs-build-time (current-time) "\ Time at which Emacs was dumped out.") -(defconst emacs-build-system (system-name)) +(defconst emacs-build-system (system-name) "\ +Name of the system on which Emacs was built.") (defun emacs-version (&optional here) "\ Return string describing the version of Emacs that is running. @@ -83,8 +84,9 @@ (purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version)) " $\n"))) -;;Local variables: -;;version-control: never -;;End: +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; End: ;;; version.el ends here ------------------------------------------------------------ revno: 106502 fixes bug(s): http://debbugs.gnu.org/8615 committer: Juri Linkov branch nick: trunk timestamp: Thu 2011-11-24 09:09:56 +0200 message: * lisp/view.el (view-buffer): Revert revno:105285 from 2011-07-19. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-24 03:59:09 +0000 +++ lisp/ChangeLog 2011-11-24 07:09:56 +0000 @@ -1,3 +1,7 @@ +2011-11-24 Juri Linkov + + * view.el (view-buffer): Revert revno:105285 from 2011-07-19 (bug#8615). + 2011-11-24 Glenn Morris * mail/rmailmm.el (rmail-mime): When rmail-enable-mime is non-nil, === modified file 'lisp/view.el' --- lisp/view.el 2011-11-14 20:23:26 +0000 +++ lisp/view.el 2011-11-24 07:09:56 +0000 @@ -311,10 +311,9 @@ Exiting View mode will then discard the user's edits. Setting EXIT-ACTION to `kill-buffer-if-not-modified' avoids this." (interactive "bView buffer: ") - (if (with-current-buffer buffer - (and (eq (get major-mode 'mode-class) - 'special) - (null buffer-file-name))) + (if (eq (with-current-buffer buffer + (get major-mode 'mode-class)) + 'special) (progn (switch-to-buffer buffer) (message "Not using View mode because the major mode is special")) ------------------------------------------------------------ revno: 106501 fixes bug(s): http://debbugs.gnu.org/8006 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-11-23 19:59:09 -0800 message: Make rmail-mime toggle headers of non-mime messages. * lisp/mail/rmailmm.el (rmail-mime): When rmail-enable-mime is non-nil, if called on a non-mime message just toggle the headers. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-24 01:58:14 +0000 +++ lisp/ChangeLog 2011-11-24 03:59:09 +0000 @@ -1,3 +1,8 @@ +2011-11-24 Glenn Morris + + * mail/rmailmm.el (rmail-mime): When rmail-enable-mime is non-nil, + if called on a non-mime message just toggle the headers. (Bug#8006) + 2011-11-24 Juanma Barranquero * allout.el (allout-setup, allout-auto-save-temporarily-disabled) === modified file 'lisp/mail/rmailmm.el' --- lisp/mail/rmailmm.el 2011-11-22 02:55:06 +0000 +++ lisp/mail/rmailmm.el 2011-11-24 03:59:09 +0000 @@ -1269,7 +1269,8 @@ (or arg (goto-char (point-min))) (point)) 'rmail-mime-entity))) (if (or (not arg) entity) (rmail-mime-toggle-raw state))) - (message "Not a MIME message"))) + (message "Not a MIME message, just toggling headers") + (rmail-toggle-header))) (let* ((data (rmail-apply-in-message rmail-current-message 'buffer-string)) (buf (get-buffer-create "*RMAIL*")) (rmail-mime-mbox-buffer rmail-view-buffer) ------------------------------------------------------------ revno: 106500 committer: Juanma Barranquero branch nick: trunk timestamp: Thu 2011-11-24 03:22:09 +0100 message: doc/lispintro/makefile.w32-in, doc/misc/makefile.w32-in: Update dependencies. diff: === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2011-11-16 17:47:25 +0000 +++ doc/lispintro/ChangeLog 2011-11-24 02:22:09 +0000 @@ -1,3 +1,7 @@ +2011-11-24 Juanma Barranquero + + * makefile.w32-in: Update dependencies. + 2011-11-16 Juanma Barranquero * emacs-lisp-intro.texi (etags): Fix typo. === modified file 'doc/lispintro/makefile.w32-in' --- doc/lispintro/makefile.w32-in 2011-01-26 08:36:39 +0000 +++ doc/lispintro/makefile.w32-in 2011-11-24 02:22:09 +0000 @@ -24,7 +24,7 @@ # Directory with the (customized) texinfo.tex file. texinfodir = $(srcdir)/../misc -INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi +INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi $(srcdir)/doclicense.texi # The file name eintr must fit within 5 characters, to allow for # -NN extensions to fit into DOS 8+3 limits without clashing INFO_TARGETS = $(infodir)/eintr === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-11-20 20:14:54 +0000 +++ doc/misc/ChangeLog 2011-11-24 02:22:09 +0000 @@ -1,3 +1,7 @@ +2011-11-24 Juanma Barranquero + + * makefile.w32-in: Update dependencies. + 2011-11-20 Glenn Morris * gnus.texi (Group Information): === modified file 'doc/misc/makefile.w32-in' --- doc/misc/makefile.w32-in 2011-01-29 14:48:19 +0000 +++ doc/misc/makefile.w32-in 2011-11-24 02:22:09 +0000 @@ -100,123 +100,127 @@ $(ENVADD) $(TEXI2DVI) $(srcdir)/info.texi -$(infodir)/ccmode: cc-mode.texi +$(infodir)/ccmode: cc-mode.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) cc-mode.texi -cc-mode.dvi: cc-mode.texi +cc-mode.dvi: cc-mode.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/cc-mode.texi -$(infodir)/ada-mode: ada-mode.texi +$(infodir)/ada-mode: ada-mode.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) ada-mode.texi -ada-mode.dvi: ada-mode.texi +ada-mode.dvi: ada-mode.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/ada-mode.texi -$(infodir)/pcl-cvs: pcl-cvs.texi +$(infodir)/pcl-cvs: pcl-cvs.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) pcl-cvs.texi -pcl-cvs.dvi: pcl-cvs.texi +pcl-cvs.dvi: pcl-cvs.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/pcl-cvs.texi -$(infodir)/eshell: eshell.texi +$(infodir)/eshell: eshell.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) eshell.texi -eshell.dvi: eshell.texi +eshell.dvi: eshell.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/eshell.texi -$(infodir)/cl: cl.texi +$(infodir)/cl: cl.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) cl.texi -cl.dvi: cl.texi +cl.dvi: cl.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/cl.texi -$(infodir)/dbus: dbus.texi +$(infodir)/dbus: dbus.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) dbus.texi -dbus.dvi: dbus.texi +dbus.dvi: dbus.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/dbus.texi -$(infodir)/dired-x: dired-x.texi +$(infodir)/dired-x: dired-x.texi $(emacsdir)/emacsver.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) dired-x.texi -dired-x.dvi: dired-x.texi +dired-x.dvi: dired-x.texi $(emacsdir)/emacsver.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/dired-x.texi -$(infodir)/ediff: ediff.texi +$(infodir)/ediff: ediff.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) ediff.texi -ediff.dvi: ediff.texi +ediff.dvi: ediff.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/ediff.texi -$(infodir)/flymake: flymake.texi +$(infodir)/flymake: flymake.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) flymake.texi -flymake.dvi: flymake.texi +flymake.dvi: flymake.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/flymake.texi -$(infodir)/forms: forms.texi +$(infodir)/forms: forms.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) forms.texi -forms.dvi: forms.texi +forms.dvi: forms.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/forms.texi # gnus/message/emacs-mime/sieve/pgg are part of Gnus: -$(infodir)/gnus: gnus.texi +$(infodir)/gnus: gnus.texi gnus-overrides.texi message.texi emacs-mime.texi \ + sieve.texi pgg.texi sasl.texi gnus-news.texi gnus-faq.texi \ + doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) gnus.texi -gnus.dvi: gnus.texi +gnus.dvi: gnus.texi gnus-overrides.texi message.texi emacs-mime.texi \ + sieve.texi pgg.texi sasl.texi gnus-news.texi gnus-faq.texi \ + doclicense.texi sed -e "/@iflatex/,/@end iflatex/d" $(srcdir)/gnus.texi > gnustmp.texi $(ENVADD) $(TEXI2DVI) gnustmp.texi cp gnustmp.dvi $*.dvi rm gnustmp.* # -$(infodir)/message: message.texi +$(infodir)/message: message.texi gnus-overrides.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) message.texi -message.dvi: message.texi +message.dvi: message.texi gnus-overrides.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/message.texi # -$(infodir)/emacs-mime: emacs-mime.texi +$(infodir)/emacs-mime: emacs-mime.texi gnus-overrides.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) --enable-encoding emacs-mime.texi -emacs-mime.dvi: emacs-mime.texi +emacs-mime.dvi: emacs-mime.texi gnus-overrides.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-mime.texi # -$(infodir)/sieve: sieve.texi +$(infodir)/sieve: sieve.texi gnus-overrides.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) sieve.texi -sieve.dvi: sieve.texi +sieve.dvi: sieve.texi gnus-overrides.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/sieve.texi # -$(infodir)/pgg: pgg.texi +$(infodir)/pgg: pgg.texi gnus-overrides.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) pgg.texi -pgg.dvi: pgg.texi +pgg.dvi: pgg.texi gnus-overrides.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/pgg.texi -$(infodir)/mh-e: mh-e.texi +$(infodir)/mh-e: mh-e.texi doclicense.texi gpl.texi $(MAKEINFO) $(MAKEINFO_OPTS) mh-e.texi -mh-e.dvi: mh-e.texi +mh-e.dvi: mh-e.texi doclicense.texi gpl.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/mh-e.texi -$(infodir)/reftex: reftex.texi +$(infodir)/reftex: reftex.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) reftex.texi -reftex.dvi: reftex.texi +reftex.dvi: reftex.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/reftex.texi -$(infodir)/remember: remember.texi +$(infodir)/remember: remember.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) remember.texi -remember.dvi: remember.texi +remember.dvi: remember.texi doclicense.texix $(ENVADD) $(TEXI2DVI) $(srcdir)/remember.texi -$(infodir)/sasl: sasl.texi +$(infodir)/sasl: sasl.texi gnus-overrides.texi $(MAKEINFO) $(MAKEINFO_OPTS) sasl.texi -sasl.dvi: sasl.texi +sasl.dvi: sasl.texi gnus-overrides.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/sasl.texi -$(infodir)/sc: sc.texi +$(infodir)/sc: sc.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) sc.texi -sc.dvi: sc.texi +sc.dvi: sc.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/sc.texi -$(infodir)/vip: vip.texi +$(infodir)/vip: vip.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) vip.texi -vip.dvi: vip.texi +vip.dvi: vip.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/vip.texi -$(infodir)/viper: viper.texi +$(infodir)/viper: viper.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) viper.texi -viper.dvi: viper.texi +viper.dvi: viper.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/viper.texi -$(infodir)/widget: widget.texi +$(infodir)/widget: widget.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) widget.texi -widget.dvi: widget.texi +widget.dvi: widget.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/widget.texi $(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi @@ -224,57 +228,56 @@ faq.dvi: faq.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/faq.texi -$(infodir)/autotype: autotype.texi +$(infodir)/autotype: autotype.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) autotype.texi -autotype.dvi: autotype.texi +autotype.dvi: autotype.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/autotype.texi -$(infodir)/calc: calc.texi $(emacsdir)/emacsver.texi +$(infodir)/calc: calc.texi $(emacsdir)/emacsver.texi gpl.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) calc.texi - -calc.dvi: calc.texi $(emacsdir)/emacsver.texi +calc.dvi: calc.texi $(emacsdir)/emacsver.texi gpl.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/calc.texi # This is produced with --no-split to avoid making files whose # names clash on DOS 8+3 filesystems -$(infodir)/idlwave: idlwave.texi +$(infodir)/idlwave: idlwave.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) --no-split idlwave.texi -idlwave.dvi: idlwave.texi +idlwave.dvi: idlwave.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/idlwave.texi -$(infodir)/eudc: eudc.texi +$(infodir)/eudc: eudc.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) eudc.texi -eudc.dvi: eudc.texi +eudc.dvi: eudc.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/eudc.texi -$(infodir)/ebrowse: ebrowse.texi +$(infodir)/ebrowse: ebrowse.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) ebrowse.texi -ebrowse.dvi: ebrowse.texi +ebrowse.dvi: ebrowse.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/ebrowse.texi -$(infodir)/woman: woman.texi +$(infodir)/woman: woman.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) woman.texi -woman.dvi: woman.texi +woman.dvi: woman.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/woman.texi -$(infodir)/speedbar: speedbar.texi +$(infodir)/speedbar: speedbar.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) speedbar.texi -speedbar.dvi: speedbar.texi +speedbar.dvi: speedbar.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/speedbar.texi -$(infodir)/tramp: tramp.texi +$(infodir)/tramp: tramp.texi trampver.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) tramp.texi -tramp.dvi: tramp.texi +tramp.dvi: tramp.texi trampver.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/tramp.texi -$(infodir)/ses: ses.texi +$(infodir)/ses: ses.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) ses.texi -ses.dvi: ses.texi +ses.dvi: ses.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/ses.texi -$(infodir)/smtpmail: smtpmail.texi +$(infodir)/smtpmail: smtpmail.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) smtpmail.texi -smtpmail.dvi: smtpmail.texi +smtpmail.dvi: smtpmail.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/smtpmail.texi $(infodir)/org: org.texi @@ -282,14 +285,14 @@ org.dvi: org.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/org.texi -$(infodir)/url: url.texi +$(infodir)/url: url.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) url.texi -url.dvi: url.texi +url.dvi: url.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/url.texi -$(infodir)/newsticker: newsticker.texi +$(infodir)/newsticker: newsticker.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) newsticker.texi -newsticker.dvi: newsticker.texi +newsticker.dvi: newsticker.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/newsticker.texi $(infodir)/nxml-mode: nxml-mode.texi @@ -297,14 +300,14 @@ nxml-mod.dvi: nxml-mode.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/nxml-mode.texi -$(infodir)/rcirc: rcirc.texi +$(infodir)/rcirc: rcirc.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) rcirc.texi -rcirc.dvi: rcirc.texi +rcirc.dvi: rcirc.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/rcirc.texi -$(infodir)/erc: erc.texi +$(infodir)/erc: erc.texi gpl.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) erc.texi -erc.dvi: erc.texi +erc.dvi: erc.texi gpl.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/erc.texi $(infodir)/ert: ert.texi @@ -322,9 +325,9 @@ mairix-el.dvi: mairix-el.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/mairix-el.texi -$(infodir)/auth: auth.texi +$(infodir)/auth: auth.texi gnus-overrides.texi $(MAKEINFO) $(MAKEINFO_OPTS) auth.texi -auth.dvi: auth.texi +auth.dvi: auth.texi gnus-overrides.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/auth.texi $(infodir)/eieio: eieio.texi @@ -337,14 +340,14 @@ ede.dvi: ede.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/ede.texi -$(infodir)/semantic: semantic.texi +$(infodir)/semantic: semantic.texi sem-user.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) semantic.texi -semantic.dvi: semantic.texi +semantic.dvi: semantic.texi sem-user.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/semantic.texi -$(infodir)/edt: edt.texi +$(infodir)/edt: edt.texi doclicense.texi $(MAKEINFO) $(MAKEINFO_OPTS) edt.texi -edt.dvi: edt.texi +edt.dvi: edt.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/edt.texi mostlyclean: ------------------------------------------------------------ revno: 106499 committer: Juanma Barranquero branch nick: trunk timestamp: Thu 2011-11-24 02:58:14 +0100 message: Fix typos. diff: === modified file 'ChangeLog' --- ChangeLog 2011-11-22 08:02:21 +0000 +++ ChangeLog 2011-11-24 01:58:14 +0000 @@ -1,3 +1,7 @@ +2011-11-24 Juanma Barranquero + + * configure.in (HAVE_XPM): Fix typo. + 2011-11-22 Glenn Morris * configure.in (EMACSDATA, EMACSDOC): If set, print, since they can === modified file 'configure.in' --- configure.in 2011-11-22 08:02:21 +0000 +++ configure.in 2011-11-24 01:58:14 +0000 @@ -2436,7 +2436,7 @@ fi if test "${HAVE_XPM}" = "yes"; then - AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm libary (-lXpm).]) + AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm library (-lXpm).]) LIBXPM=-lXpm fi fi === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-11-24 00:12:46 +0000 +++ doc/emacs/ChangeLog 2011-11-24 01:58:14 +0000 @@ -1,3 +1,7 @@ +2011-11-24 Juanma Barranquero + + * display.texi (Font Lock): Fix typo. + 2011-11-24 Glenn Morris * rmail.texi (Rmail Output): === modified file 'doc/emacs/display.texi' --- doc/emacs/display.texi 2011-10-24 02:01:54 +0000 +++ doc/emacs/display.texi 2011-11-24 01:58:14 +0000 @@ -762,7 +762,7 @@ the sake of speed, some modes, including Lisp mode, rely on a special convention: an open-parenthesis or open-brace in the leftmost column always defines the beginning of a defun, and is thus always outside -any string or comment. Therefore, you should avoid placing a an +any string or comment. Therefore, you should avoid placing an open-parenthesis or open-brace in the leftmost column, if it is inside a string or comment. @xref{Left Margin Paren}, for details. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-23 20:05:50 +0000 +++ lisp/ChangeLog 2011-11-24 01:58:14 +0000 @@ -1,3 +1,20 @@ +2011-11-24 Juanma Barranquero + + * allout.el (allout-setup, allout-auto-save-temporarily-disabled) + (allout-lead-with-comment-string, allout-structure-deleted-hook) + (allout-mode, allout-chart-subtree, allout-hotspot-key-handler) + (allout-rebullet-heading, allout-open-sibtopic) + (allout-toggle-current-subtree-encryption) + (allout-toggle-subtree-encryption, allout-encrypt-string) + (allout-next-topic-pending-encryption, allout-adjust-file-variable) + (allout-distinctive-bullets-string, allout-auto-activation): + * window.el (window-normalize-buffer-to-display): + * progmodes/verilog-mode.el (verilog-batch-indent): + * textmodes/bibtex.el (bibtex-field-braces-opt) + (bibtex-field-strings-opt): + * vc/cvs-status.el (cvs-tree-merge): + Fix typos. + 2011-11-23 Michael Albinus * rfn-eshadow.el (rfn-eshadow-update-overlay): Let-bind === modified file 'lisp/ChangeLog.3' --- lisp/ChangeLog.3 2011-11-20 03:48:53 +0000 +++ lisp/ChangeLog.3 2011-11-24 01:58:14 +0000 @@ -11362,7 +11362,7 @@ * blackbox.el (bb-init-board): Use (random 8) to get # in [0,7]. * dissociate.el: Likewise. * fill.el (justify-current-line): Likewise. - * flame.el (define-element, psychoanalize-flamer): Likewise. + * flame.el (define-element, psychoanalyze-flamer): Likewise. * yow.el (yow): Likewise. * doctor.el: Use (random N), not (random-range N). (random-range): Function deleted. === modified file 'lisp/ChangeLog.9' --- lisp/ChangeLog.9 2011-11-23 07:03:56 +0000 +++ lisp/ChangeLog.9 2011-11-24 01:58:14 +0000 @@ -2021,7 +2021,7 @@ newbuffile out of the loop, in the newbuffile-nd local var. Use dolist (cosmetic change). Compute the proposed name for the most common case and cache it in the fourth place in the item. - (uniquify-rationalize-file-buffer-names): Used to return a a list + (uniquify-rationalize-file-buffer-names): Used to return a list of buffer whose name was changed, but that return value was never used. (uniquify-item-lessp): Replaces uniquify-filename-lessp, works on the cached proposed name, does much less consing and is quicker. === modified file 'lisp/allout.el' --- lisp/allout.el 2011-11-23 07:03:56 +0000 +++ lisp/allout.el 2011-11-24 01:58:14 +0000 @@ -279,7 +279,7 @@ ;;;_ > allout-setup () ;;;###autoload (defun allout-setup () - "Do fundamental emacs session for allout auto-activation. + "Do fundamental Emacs session for allout auto-activation. Establishes allout processing as part of visiting a file if `allout-auto-activation' is non-nil, or removes it otherwise. @@ -298,7 +298,7 @@ activated when files are visited with non-nil buffer-specific file variable `allout-layout'. -When allout-auto-activation is \"On\" \(t), allout mode is +When allout-auto-activation is \"On\" (t), allout mode is activated in buffers with non-nil `allout-layout', and the specified layout is applied. @@ -560,7 +560,7 @@ These bullets are distinguish topics with particular character. They are not used by default in the topic creation routines, but are offered as options when you modify topic creation with a -universal argument \(\\[universal-argument]), or during rebulleting \(\\[allout-rebullet-current-heading]). +universal argument (\\[universal-argument]), or during rebulleting (\\[allout-rebullet-current-heading]). Distinctive bullets are not cycled when topics are shifted or otherwise automatically rebulleted, so their marking is @@ -844,7 +844,7 @@ (defvar allout-auto-save-temporarily-disabled nil "True while topic encryption is pending and auto-saving was active. -The value of buffer-saved-size at the time of decryption is used, +The value of `buffer-saved-size' at the time of decryption is used, for restoring when all encryptions are established.") (defvar allout-just-did-undo nil "True just after undo commands, until allout-post-command-business.") @@ -910,7 +910,7 @@ (defvar allout-layout nil ; LEAVE GLOBAL VALUE NIL -- see docstring. "Buffer-specific setting for allout layout. -In buffers where this is non-nil \(and if `allout-auto-activation' +In buffers where this is non-nil (and if `allout-auto-activation' has been customized to enable this behavior), `allout-mode' will be automatically activated. The layout dictated by the value will be used to set the initial exposure when `allout-mode' is activated. @@ -1037,7 +1037,7 @@ (defun allout-lead-with-comment-string (&optional header-lead) "Set the topic-header leading string to specified string. -Useful when for encapsulating outline structure in programming +Useful for encapsulating outline structure in programming language comments. Returns the leading string." (interactive "P") @@ -1440,7 +1440,7 @@ - DEPTH -- integer indicating the depth of the subtree that was deleted. - REMOVED-FROM -- integer indicating the point where the subtree was removed. -Some edits that remove or invalidate items may missed by this hook: +Some edits that remove or invalidate items may be missed by this hook: specifically edits that native allout routines do not control. This hook might be invoked multiple times by a single command.") @@ -1472,10 +1472,10 @@ Functions on the hook should not require any arguments.") ;;;_ = allout-outside-normal-auto-fill-function (defvar allout-outside-normal-auto-fill-function nil - "Value of normal-auto-fill-function outside of allout mode. + "Value of `normal-auto-fill-function' outside of allout mode. -Used by allout-auto-fill to do the mandated normal-auto-fill-function -wrapped within allout's automatic fill-prefix setting.") +Used by `allout-auto-fill' to do the mandated `normal-auto-fill-function' +wrapped within allout's automatic `fill-prefix' setting.") (make-variable-buffer-local 'allout-outside-normal-auto-fill-function) ;;;_ = prevent redundant activation by desktop mode: (add-to-list 'desktop-minor-mode-handlers '(allout-mode . nil)) @@ -1576,7 +1576,7 @@ non-nil return on `write-contents-functions' to prevent saving of the buffer while it has decrypted content. -This behavior depends on emacs versions that implement the +This behavior depends on Emacs versions that implement the `write-contents-functions' hook." (if (or (not (allout-mode-p)) @@ -1627,7 +1627,7 @@ ) ;;;_ > allout-called-interactively-p () (defmacro allout-called-interactively-p () - "A version of called-interactively-p independent of emacs version." + "A version of `called-interactively-p' independent of Emacs version." ;; ... to ease maintenance of allout without betraying deprecation. (if (equal (subr-arity (symbol-function 'called-interactively-p)) '(0 . 0)) @@ -1712,7 +1712,7 @@ outline oriented formatting and manipulation. It enables structural editing of outlines, as well as navigation and exposure. It also is specifically aimed at accommodating -syntax-sensitive text like programming languages. \(For example, +syntax-sensitive text like programming languages. (For example, see the allout code itself, which is organized as an allout outline.) @@ -1733,7 +1733,7 @@ of special `allout-mode' features and terminology. See also the outline menubar additions for quick reference to many of the features. Customize `allout-auto-activation' to prepare your -emacs session for automatic activation of `allout-mode'. +Emacs session for automatic activation of `allout-mode'. The bindings are those listed in `allout-prefixed-keybindings' and `allout-unprefixed-keybindings'. We recommend customizing @@ -1781,7 +1781,7 @@ \\[allout-rebullet-current-heading] `allout-rebullet-current-heading' Prompt for alternate bullet for current topic \\[allout-rebullet-topic] `allout-rebullet-topic' Reconcile bullets of topic and - its' offspring -- distinctive bullets are not changed, others + its offspring -- distinctive bullets are not changed, others are alternated according to nesting depth. \\[allout-number-siblings] `allout-number-siblings' Number bullets of topic and siblings -- the offspring are not affected. @@ -1791,12 +1791,12 @@ ---------------------------------- \\[allout-kill-topic] `allout-kill-topic' Kill current topic, including offspring. \\[allout-copy-topic-as-kill] `allout-copy-topic-as-kill' Copy current topic, including offspring. -\\[allout-kill-line] `allout-kill-line' kill-line, attending to outline structure. +\\[allout-kill-line] `allout-kill-line' Kill line, attending to outline structure. \\[allout-copy-line-as-kill] `allout-copy-line-as-kill' Copy line but don't delete it. \\[allout-yank] `allout-yank' Yank, adjusting depth of yanked topic to depth of heading if yanking into bare topic heading (ie, prefix sans text). -\\[allout-yank-pop] `allout-yank-pop' Is to allout-yank as yank-pop is to yank +\\[allout-yank-pop] `allout-yank-pop' Is to `allout-yank' as `yank-pop' is to `yank'. Topic-oriented Encryption: ------------------------- @@ -1836,7 +1836,7 @@ NOTE: A few GnuPG v2 versions improperly preserve incorrect symmetric decryption keys, preventing entry of the correct key on subsequent decryption attempts until the cache times-out. That -can take several minutes. \(Decryption of other entries is not +can take several minutes. (Decryption of other entries is not affected.) Upgrade your EasyPG version, if you can, and you can deliberately clear your gpg-agent's cache by sending it a '-HUP' signal. @@ -1877,7 +1877,7 @@ without changes to the allout core. Here are key ones: `allout-mode-hook' -`allout-mode-deactivate-hook' \(deprecated) +`allout-mode-deactivate-hook' (deprecated) `allout-mode-off-hook' `allout-exposure-change-hook' `allout-structure-added-hook' @@ -1939,7 +1939,7 @@ When the PREFIX-LEAD is set to the comment-string of a programming language, outline structuring can be embedded in program code without interfering with processing of the text - (by emacs or the language processor) as program code. This + (by Emacs or the language processor) as program code. This setting happens automatically when allout mode is used in programming-mode buffers. See `allout-use-mode-specific-leader' docstring for more detail. @@ -1951,7 +1951,7 @@ `allout-distinctive-bullets-string'. When creating a TOPIC, plain BULLETs are by default used, according to the DEPTH of the TOPIC. Choice among the distinctive BULLETs is offered when you - provide a universal argugment \(\\[universal-argument]) to the + provide a universal argument (\\[universal-argument]) to the TOPIC creation command, or when explictly rebulleting a TOPIC. The significance of the various distinctive bullets is purely by convention. See the documentation for the above bullet strings for @@ -2250,7 +2250,7 @@ allout-recent-prefix-end)) ;;;_ > allout-recent-bullet () (defmacro allout-recent-bullet () - "Like allout-recent-prefix, but returns bullet of last encountered prefix. + "Like `allout-recent-prefix', but returns bullet of last encountered prefix. All outline functions which directly do string matches to assess headings set the variables `allout-recent-prefix-beginning' and @@ -2625,13 +2625,13 @@ Point is left at the end of the subtree. Charts are used to capture outline structure, so that outline-altering -routines need assess the structure only once, and then use the chart +routines need to assess the structure only once, and then use the chart for their elaborate manipulations. The chart entries for the topics are in reverse order, so the last topic is listed first. The entry for each topic consists of an integer indicating the point at the beginning of the topic -prefix. Charts for offspring consists of a list containing, +prefix. Charts for offspring consist of a list containing, recursively, the charts for the respective subtopics. The chart for a topics' offspring precedes the entry for the topic itself. @@ -3186,7 +3186,7 @@ (if (allout-called-interactively-p) (allout-end-of-prefix))))) ;;;_ > allout-next-visible-heading (arg) (defun allout-next-visible-heading (arg) - "Move to the next ARG'th visible heading line, backward if arg is negative. + "Move to the next ARGth visible heading line, backward if ARG is negative. Move to buffer limit in indicated direction if headings are exhausted." @@ -3388,8 +3388,8 @@ "Catchall handling of key bindings in hot-spots. Translates unmodified keystrokes to corresponding allout commands, when -they would qualify if prefixed with the allout-command-prefix, and sets -this-command accordingly. +they would qualify if prefixed with the `allout-command-prefix', and sets +`this-command' accordingly. Returns the qualifying command, if any, else nil." (interactive) @@ -3533,7 +3533,7 @@ If INSTEAD is: - nil, then the bullet char for the context is used, per distinction or depth -- a \(numeric) character, then character's string representation is used +- a (numeric) character, then character's string representation is used - a string, then the user is asked for bullet with the first char as default - anything else, the user is solicited with bullet char per context as default @@ -3849,7 +3849,7 @@ (defun allout-open-subtopic (arg) "Open new topic header at deeper level than the current one. -Negative universal arg means to open deeper, but place the new topic +Negative universal ARG means to open deeper, but place the new topic prior to the current one." (interactive "p") (allout-open-topic 1 (> 0 arg) (< 1 arg))) @@ -3857,9 +3857,9 @@ (defun allout-open-sibtopic (arg) "Open new topic header at same level as the current one. -Positive universal arg means to use the bullet of the prior sibling. +Positive universal ARG means to use the bullet of the prior sibling. -Negative universal arg means to place the new topic prior to the current +Negative universal ARG means to place the new topic prior to the current one." (interactive "p") (allout-open-topic 0 (> 0 arg) (not (= 1 arg)))) @@ -3867,7 +3867,7 @@ (defun allout-open-supertopic (arg) "Open new topic header at shallower level than the current one. -Negative universal arg means to open shallower, but place the new +Negative universal ARG means to open shallower, but place the new topic prior to the current one." (interactive "p") @@ -3992,7 +3992,7 @@ If INSTEAD is: - nil, then the bullet char for the context is used, per distinction or depth -- a \(numeric) character, then character's string representation is used +- a (numeric) character, then character's string representation is used - a string, then the user is asked for bullet with the first char as default - anything else, the user is solicited with bullet char per context as default @@ -4033,7 +4033,7 @@ number-control index))) - ;; Is new one is identical to old? + ;; Is new one identical to old? (if (and (= current-depth new-depth) (string= current-bullet (substring new-prefix (1- (length new-prefix))))) @@ -4407,7 +4407,7 @@ (run-hook-with-args 'allout-structure-deleted-hook depth (point)))))) ;;;_ > allout-copy-line-as-kill () (defun allout-copy-line-as-kill () - "Like allout-kill-topic, but save to kill ring instead of deleting." + "Like `allout-kill-topic', but save to kill ring instead of deleting." (interactive) (let ((buffer-read-only t)) (condition-case nil @@ -5854,12 +5854,12 @@ (defun allout-toggle-current-subtree-encryption (&optional keymode-cue) "Encrypt clear or decrypt encoded topic text. -Allout uses emacs 'epg' libary to perform encryption. Symmetric +Allout uses Emacs 'epg' library to perform encryption. Symmetric and keypair encryption are supported. All encryption is ascii armored. Entry encryption defaults to symmetric key mode unless keypair -recipients are associated with the file \(see +recipients are associated with the file (see `epa-file-encrypt-to') or the function is invoked with a \(KEYMODE-CUE) universal argument greater than 1. @@ -5881,7 +5881,7 @@ the bullet signals that the body is encrypted, its absence means the topic is meant to be encrypted but is not currently. When a file with topics pending encryption is saved, topics pending -encryption are encrypted. See allout-encrypt-unencrypted-on-saves +encryption are encrypted. See `allout-encrypt-unencrypted-on-saves' for auto-encryption specifics. \*NOTE WELL* that automatic encryption that happens during saves will @@ -5900,7 +5900,7 @@ "Encrypt clear text or decrypt encoded topic contents (body and subtopics.) Entry encryption defaults to symmetric key mode unless keypair -recipients are associated with the file \(see +recipients are associated with the file (see `epa-file-encrypt-to') or the function is invoked with a \(KEYMODE-CUE) universal argument greater than 1. @@ -5916,7 +5916,7 @@ recipients with the file, by selecting no recipients in the dialog. -Encryption and decryption uses the emacs epg library. +Encryption and decryption uses the Emacs 'epg' library. Encrypted text will be ascii-armored. @@ -6033,7 +6033,7 @@ ALLOUT-BUFFER identifies the buffer containing the text. Entry encryption defaults to symmetric key mode unless keypair -recipients are associated with the file \(see +recipients are associated with the file (see `epa-file-encrypt-to') or the function is invoked with a \(KEYMODE-CUE) universal argument greater than 1. @@ -6057,7 +6057,7 @@ NOTE: A few GnuPG v2 versions improperly preserve incorrect symmetric decryption keys, preventing entry of the correct key on subsequent decryption attempts until the cache times-out. That -can take several minutes. \(Decryption of other entries is not +can take several minutes. (Decryption of other entries is not affected.) Upgrade your EasyPG version, if you can, and you can deliberately clear your gpg-agent's cache by sending it a '-HUP' signal." @@ -6196,7 +6196,7 @@ (defun allout-inhibit-auto-save-info-for-decryption (was-buffer-saved-size) "Temporarily prevent auto-saves in this buffer when an item is decrypted. -WAS-BUFFER-SAVED-SIZE is the value of buffer-saved-size *before* +WAS-BUFFER-SAVED-SIZE is the value of `buffer-saved-size' *before* the decryption." (when (not (or (= buffer-saved-size -1) (= was-buffer-saved-size -1))) (setq allout-auto-save-temporarily-disabled was-buffer-saved-size @@ -6229,8 +6229,8 @@ "Return the point of the next topic pending encryption, or nil if none. Such a topic has the `allout-topic-encryption-bullet' without an -immediately following '*' that would mark the topic as being encrypted. It -must also have content." +immediately following '*' that would mark the topic as being encrypted. +It must also have content." (let (done got content-beg) (save-match-data (while (not done) @@ -6332,7 +6332,7 @@ "Activate outline mode and establish file var so it is started subsequently. See `allout-layout' and customization of `allout-auto-activation' -for details on preparing emacs for automatic allout activation." +for details on preparing Emacs for automatic allout activation." (interactive "P") @@ -6380,7 +6380,7 @@ (defun allout-adjust-file-variable (varname value) "Adjust the setting of an Emacs file variable named VARNAME to VALUE. -This activity is inhibited if either `enable-local-variables' +This activity is inhibited if either `enable-local-variables' or `allout-enable-file-variable-adjustment' are nil. When enabled, an entry for the variable is created if not already present, === modified file 'lisp/cedet/ChangeLog' --- lisp/cedet/ChangeLog 2011-11-20 03:48:53 +0000 +++ lisp/cedet/ChangeLog 2011-11-24 01:58:14 +0000 @@ -1,3 +1,7 @@ +2011-11-24 Juanma Barranquero + + * semantic/lex-spp.el (semantic-lex-spp-first-token-arg-list): Fix typo. + 2011-11-20 Juanma Barranquero * cedet-cscope.el (cedet-cscope-version-check): === modified file 'lisp/cedet/semantic/bovine/c.el' --- lisp/cedet/semantic/bovine/c.el 2011-11-20 07:30:16 +0000 +++ lisp/cedet/semantic/bovine/c.el 2011-11-24 01:58:14 +0000 @@ -298,7 +298,7 @@ ;; @TODO - can we use the new c-scan-conditionals (c-forward-conditional 1)) ((looking-at "^\\s-*#\\s-*elif") - ;; We need to let the preprocessor analize this one. + ;; We need to let the preprocessor analyze this one. (beginning-of-line) (setq done t) ) === modified file 'lisp/cedet/semantic/lex-spp.el' --- lisp/cedet/semantic/lex-spp.el 2011-11-23 07:03:56 +0000 +++ lisp/cedet/semantic/lex-spp.el 2011-11-24 01:58:14 +0000 @@ -821,7 +821,7 @@ ;; a macro. (defun semantic-lex-spp-first-token-arg-list (token) - "If TOKEN is a semantic-list, turn it into a an SPP ARG LIST." + "If TOKEN is a semantic-list, turn it into an SPP ARG LIST." (when (and (consp token) (symbolp (car token)) (eq 'semantic-list (car token))) === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-11-24 00:15:19 +0000 +++ lisp/gnus/ChangeLog 2011-11-24 01:58:14 +0000 @@ -1,3 +1,7 @@ +2011-11-24 Juanma Barranquero + + * gnus-group.el (gnus-group-highlight): Fix typo. + 2011-11-24 Adam W (tiny change) * mail-source.el (mail-source-fetch-maildir): Don't expect the return @@ -2277,7 +2281,7 @@ * gnus-art.el (gnus-article-next-page-1): Because customized mode-line face with line-width greater than zero will cause RET in gnus summary buffer to scroll down article page-wise because auto vscroll happens, - it should be temporalily disabled when doing a scroll-up. + it should be temporally disabled when doing a scroll-up. 2011-02-19 Lars Ingebrigtsen @@ -11700,7 +11704,7 @@ (nntp-open-marks): Decode group names when bootstrapping marks. * rfc2047.el (rfc2047-encode-message-header): Make XEmacs decode - Newsgroups and Folowup-To headers. + Newsgroups and Followup-To headers. 2007-07-13 Katsumi Yamaoka === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2011-11-20 07:30:16 +0000 +++ lisp/gnus/gnus-group.el 2011-11-24 01:58:14 +0000 @@ -362,7 +362,7 @@ gnus-group-news-low)) "*Controls the highlighting of group buffer lines. -Below is a list of `Form'/`Face' pairs. When deciding how a a +Below is a list of `Form'/`Face' pairs. When deciding how a particular group line should be displayed, each form is evaluated. The content of the face field after the first true form is used. You can change how those group lines are displayed by === modified file 'lisp/mh-e/ChangeLog.1' --- lisp/mh-e/ChangeLog.1 2011-11-23 07:03:56 +0000 +++ lisp/mh-e/ChangeLog.1 2011-11-24 01:58:14 +0000 @@ -2553,7 +2553,7 @@ for users who have customized it to a long list now redundant with `mh-invisible-header-fields-default'. (mh-invisible-header-fields-default-override): New defcustom. - Users check off the fields they want displyed from what we + Users check off the fields they want displayed from what we included in `mh-invisible-header-fields-default'. (mh-invisible-headers): Function adapted to new variables. === modified file 'lisp/net/ange-ftp.el' --- lisp/net/ange-ftp.el 2011-11-20 02:29:42 +0000 +++ lisp/net/ange-ftp.el 2011-11-24 01:58:14 +0000 @@ -5995,7 +5995,7 @@ (concat pubset (and userid (concat userid ".")) - ;; change every '/' in filename to a '.', normally not neccessary + ;; change every '/' in filename to a '.', normally not necessary (and filename (subst-char-in-string ?/ ?. filename))))) ;; Let's hope that BS2000 recognize this anyway: === modified file 'lisp/obsolete/fast-lock.el' --- lisp/obsolete/fast-lock.el 2011-04-20 17:18:34 +0000 +++ lisp/obsolete/fast-lock.el 2011-11-24 01:58:14 +0000 @@ -144,7 +144,7 @@ ;; 3.07--3.08: ;; - Made `fast-lock-read-cache' set `fast-lock-cache-filename' ;; 3.08--3.09: -;; - Made `fast-lock-save-cache' cope if `fast-lock-minimum-size' is an a list +;; - Made `fast-lock-save-cache' cope if `fast-lock-minimum-size' is a list ;; - Made `fast-lock-mode' respect the value of `font-lock-inhibit-thing-lock' ;; - Added `fast-lock-after-unfontify-buffer' ;; 3.09--3.10: === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2011-11-23 07:03:56 +0000 +++ lisp/org/ChangeLog 2011-11-24 01:58:14 +0000 @@ -1,3 +1,7 @@ +2011-11-24 Juanma Barranquero + + * ob.el (org-babel-execute-src-block): Fix typo. + 2011-11-20 Juanma Barranquero * org.el (org-link-unescape, org-link-unescape-compound): Fix typos. === modified file 'lisp/org/ob.el' --- lisp/org/ob.el 2011-08-18 20:57:10 +0000 +++ lisp/org/ob.el 2011-11-24 01:58:14 +0000 @@ -380,7 +380,7 @@ execution and the collection and formatting of results can be controlled through a variety of header arguments. -With prefix argument ARG, force re-execution even if a an +With prefix argument ARG, force re-execution even if an existing result cached in the buffer would otherwise have been returned. === modified file 'lisp/progmodes/cc-cmds.el' --- lisp/progmodes/cc-cmds.el 2011-11-20 02:29:42 +0000 +++ lisp/progmodes/cc-cmds.el 2011-11-24 01:58:14 +0000 @@ -2316,7 +2316,7 @@ (defun c-after-statement-terminator-p () ; Should we pass in LIM here? ;; Does point immediately follow a statement "terminator"? A virtual - ;; semicolon is regarded here as such. So is a an opening brace ;-) + ;; semicolon is regarded here as such. So is an opening brace ;-) ;; ;; This function might do hidden buffer changes. (or (save-excursion === modified file 'lisp/progmodes/gud.el' --- lisp/progmodes/gud.el 2011-11-20 02:29:42 +0000 +++ lisp/progmodes/gud.el 2011-11-24 01:58:14 +0000 @@ -1745,7 +1745,7 @@ ;; All the .java files in the directories in gud-jdb-directories are ;; syntactically analyzed each time gud jdb is invoked. It would be ;; nice to keep as much information as possible between runs. It would -;; be really nice to analyze the files only as neccessary (when the +;; be really nice to analyze the files only as necessary (when the ;; source needs to be displayed.) I'm not sure to what extent the former ;; can be accomplished and I'm not sure the latter can be done at all ;; since I don't know of any general way to tell which .class files are === modified file 'lisp/progmodes/verilog-mode.el' --- lisp/progmodes/verilog-mode.el 2011-11-19 09:18:31 +0000 +++ lisp/progmodes/verilog-mode.el 2011-11-24 01:58:14 +0000 @@ -4627,7 +4627,7 @@ (verilog-batch-execute-func `verilog-inject-auto)) (defun verilog-batch-indent () - "For use with --batch, reindent an a entire file as a stand-alone tool. + "For use with --batch, reindent an entire file as a stand-alone tool. This sets up the appropriate Verilog mode environment, calls \\[verilog-indent-buffer] on all command-line files, and saves the buffers." (unless noninteractive === modified file 'lisp/textmodes/bibtex.el' --- lisp/textmodes/bibtex.el 2011-11-20 02:29:42 +0000 +++ lisp/textmodes/bibtex.el 2011-11-24 01:58:14 +0000 @@ -1451,12 +1451,12 @@ (defvar bibtex-field-braces-opt nil "Optimized value of `bibtex-field-braces-alist'. Created by `bibtex-field-re-init'. -It is a an alist with elements (FIELD . REGEXP).") +It is an alist with elements (FIELD . REGEXP).") (defvar bibtex-field-strings-opt nil "Optimized value of `bibtex-field-strings-alist'. Created by `bibtex-field-re-init'. -It is a an alist with elements (FIELD RULE1 RULE2 ...), +It is an alist with elements (FIELD RULE1 RULE2 ...), where each RULE is (REGEXP . TO-STR).") (defvar bibtex-pop-previous-search-point nil === modified file 'lisp/vc/cvs-status.el' --- lisp/vc/cvs-status.el 2011-03-11 20:04:22 +0000 +++ lisp/vc/cvs-status.el 2011-11-24 01:58:14 +0000 @@ -257,7 +257,7 @@ (defun cvs-tree-merge (tree1 tree2) "Merge tags trees TREE1 and TREE2 into one. -BEWARE: because of stability issues, this is not a symetric operation." +BEWARE: because of stability issues, this is not a symmetric operation." (assert (and (listp tree1) (listp tree2))) (cond ((null tree1) tree2) === modified file 'lisp/wdired.el' --- lisp/wdired.el 2011-09-09 15:49:00 +0000 +++ lisp/wdired.el 2011-11-24 01:58:14 +0000 @@ -32,7 +32,7 @@ ;; the files in a "dired" buffer? Now you can do this. All the power ;; of Emacs commands are available to renaming files! ;; -;; This package provides a function that makes the filenames of a a +;; This package provides a function that makes the filenames of a ;; dired buffer editable, by changing the buffer mode (which inhibits ;; all of the commands of dired mode). Here you can edit the names of ;; one or more files and directories, and when you press C-c C-c, the === modified file 'lisp/window.el' --- lisp/window.el 2011-11-20 06:37:46 +0000 +++ lisp/window.el 2011-11-24 01:58:14 +0000 @@ -4522,7 +4522,7 @@ (defun window-normalize-buffer-to-display (buffer-or-name) "Normalize BUFFER-OR-NAME argument for buffer display functions. -If BUFFER-OR-NAME is nil, return the curent buffer. Else, if a +If BUFFER-OR-NAME is nil, return the current buffer. Else, if a buffer specified by BUFFER-OR-NAME exists, return that buffer. If no such buffer exists, create a buffer with the name BUFFER-OR-NAME and return that buffer." === modified file 'lwlib/lwlib.c' --- lwlib/lwlib.c 2011-10-13 14:55:46 +0000 +++ lwlib/lwlib.c 2011-11-24 01:58:14 +0000 @@ -1156,9 +1156,9 @@ /* To forbid recursive calls */ static Boolean lwlib_updating; -/* This function can be used as a an XtCallback for the widgets that get - modified to update other instances of the widgets. Closure should be the - widget_instance. */ +/* This function can be used as an XtCallback for the widgets that get + modified to update other instances of the widgets. Closure should be the + widget_instance. */ void lw_internal_update_other_instances (Widget widget, XtPointer closure, === modified file 'src/ChangeLog.11' --- src/ChangeLog.11 2011-11-23 07:03:56 +0000 +++ src/ChangeLog.11 2011-11-24 01:58:14 +0000 @@ -2191,7 +2191,7 @@ 2010-12-16 Jan Djärv * nsterm.m (ns_draw_window_cursor): If the cursor color is the - same as the background, use the face forground as cursor. + same as the background, use the face foreground as cursor. 2010-12-13 Eli Zaretskii === modified file 'src/msdos.c' --- src/msdos.c 2011-11-19 09:18:31 +0000 +++ src/msdos.c 2011-11-24 01:58:14 +0000 @@ -1558,7 +1558,7 @@ { } -/* Remember the screen colors of the curent frame, to serve as the +/* Remember the screen colors of the current frame, to serve as the default colors for newly-created frames. */ DEFUN ("msdos-remember-default-colors", Fmsdos_remember_default_colors, Smsdos_remember_default_colors, 1, 1, 0, ------------------------------------------------------------ revno: 106498 author: Adam W committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2011-11-24 00:15:19 +0000 message: mail-source.el (mail-source-fetch-maildir): Don't expect the return value of `delete-file', that returns nil for a local file but returns t for a remote file using ssh. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-11-23 00:20:17 +0000 +++ lisp/gnus/ChangeLog 2011-11-24 00:15:19 +0000 @@ -1,3 +1,9 @@ +2011-11-24 Adam W (tiny change) + + * mail-source.el (mail-source-fetch-maildir): Don't expect the return + value of `delete-file', that returns nil for a local file but returns t + for a remote file using ssh. + 2011-11-22 Lars Magne Ingebrigtsen * shr.el (shr-table-horizontal-line): Use "?\s" instead of "? " to === modified file 'lisp/gnus/mail-source.el' --- lisp/gnus/mail-source.el 2011-02-13 00:25:29 +0000 +++ lisp/gnus/mail-source.el 2011-11-24 00:15:19 +0000 @@ -1017,6 +1017,7 @@ (dolist (file (directory-files (concat path subdir) t)) (when (and (not (file-directory-p file)) (not (if function + ;; `function' should return nil if successful. (funcall function file mail-source-crash-box) (let ((coding-system-for-write mm-text-coding-system) @@ -1035,7 +1036,8 @@ ;;; (insert "\n\n") ;; MMDF mail format (insert "\001\001\001\001\n")) - (delete-file file))))) + (delete-file file) + nil)))) (incf found (mail-source-callback callback file)) (mail-source-delete-crash-box))))) found))) ------------------------------------------------------------ revno: 106497 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-11-23 19:12:46 -0500 message: * rmail.texi (Rmail Output): Mention rmail-automatic-folder-directives. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-11-21 06:16:49 +0000 +++ doc/emacs/ChangeLog 2011-11-24 00:12:46 +0000 @@ -1,3 +1,8 @@ +2011-11-24 Glenn Morris + + * rmail.texi (Rmail Output): + Mention rmail-automatic-folder-directives. (Bug#9657) + 2011-11-21 Chong Yidong * mark.texi (Global Mark Ring): Fix description of global mark === modified file 'doc/emacs/rmail.texi' --- doc/emacs/rmail.texi 2011-10-24 02:01:54 +0000 +++ doc/emacs/rmail.texi 2011-11-24 00:12:46 +0000 @@ -571,6 +571,22 @@ that returns a file name as a string. @code{rmail-output-file-alist} applies to both @kbd{o} and @kbd{C-o}. +@vindex rmail-automatic-folder-directives +Rmail can automatically save messages from your primary Rmail file +(the one that @code{rmail-file-name} specifies) to other files, based +on the value of the variable @code{rmail-automatic-folder-directives}. +This variable is a list of elements (@samp{directives}) that say which +messages to save where. Each directive is a list consisting of an +output file, followed by one or more pairs of a header name and a regular +expression. If a message has a header matching the specified regular +expression, that message is saved to the given file. If the directive +has more than one header entry, all must match. Rmail checks directives +when it shows a message from the file @code{rmail-file-name}, and +applies the first that matches (if any). If the output file is +@code{nil}, the message is deleted, not saved. For example, you can use +this feature to save messages from a particular address, or with a +particular subject, to a dedicated file. + @node Rmail Labels @section Labels @cindex label (Rmail) ------------------------------------------------------------ revno: 106496 committer: Michael Albinus branch nick: trunk timestamp: Wed 2011-11-23 21:05:50 +0100 message: *** empty log message *** diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-23 20:02:55 +0000 +++ lisp/ChangeLog 2011-11-23 20:05:50 +0000 @@ -1,3 +1,8 @@ +2011-11-23 Michael Albinus + + * rfn-eshadow.el (rfn-eshadow-update-overlay): Let-bind + `non-essential' to t, in order to avoid remote connections. + 2011-11-23 Eli Zaretskii * emacs-lisp/autoload.el (autoload-generate-file-autoloads): On ------------------------------------------------------------ revno: 106495 committer: Michael Albinus branch nick: trunk timestamp: Wed 2011-11-23 21:02:55 +0100 message: * rfn-eshadow.el (rfn-eshadow-update-overlay): Let-bind `non-essential' to t, in order to avoid remote connections. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-23 18:39:38 +0000 +++ lisp/ChangeLog 2011-11-23 20:02:55 +0000 @@ -240,12 +240,12 @@ 2011-11-16 Michael Albinus - * net/tramp.el (tramp-handle-file-truename): Cache only the local - file name. - * net/tramp-cache.el (tramp-flush-file-property): Flush also properties of linked files. (Bug#9879) + * net/tramp-sh.el (tramp-sh-handle-file-truename): Cache only the + local file name. + 2011-11-16 Juanma Barranquero * menu-bar.el (menu-bar-file-menu): === modified file 'lisp/rfn-eshadow.el' --- lisp/rfn-eshadow.el 2011-10-19 12:54:24 +0000 +++ lisp/rfn-eshadow.el 2011-11-23 20:02:55 +0000 @@ -179,7 +179,8 @@ (let ((goal (substitute-in-file-name (minibuffer-contents))) (mid (overlay-end rfn-eshadow-overlay)) (start (minibuffer-prompt-end)) - (end (point-max))) + (end (point-max)) + (non-essential t)) (unless ;; Catch the common case where the shadow does not need to move. (and mid ------------------------------------------------------------ revno: 106494 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2011-11-23 20:39:38 +0200 message: Fix "make autoloads" on MS-Windows. lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads): On MS-DOS and MS-Windows, compare with loaddefs.el case-insensitively. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-23 08:48:07 +0000 +++ lisp/ChangeLog 2011-11-23 18:39:38 +0000 @@ -1,3 +1,9 @@ +2011-11-23 Eli Zaretskii + + * emacs-lisp/autoload.el (autoload-generate-file-autoloads): On + MS-DOS and MS-Windows, compare with loaddefs.el + case-insensitively. + 2011-11-23 Mark Lillibridge (tiny change) * mail/unrmail.el (unrmail): Always add blank line. (Bug#7743) === modified file 'lisp/emacs-lisp/autoload.el' --- lisp/emacs-lisp/autoload.el 2011-11-21 14:22:02 +0000 +++ lisp/emacs-lisp/autoload.el 2011-11-23 18:39:38 +0000 @@ -446,7 +446,11 @@ generated-autoload-load-name (autoload-file-load-name absfile))) (when (and outfile - (not (equal outfile (autoload-generated-file)))) + (not + (if (memq system-type '(ms-dos windows-nt)) + (equal (downcase outfile) + (downcase (autoload-generated-file))) + (equal outfile (autoload-generated-file))))) (setq otherbuf t)) (save-excursion (save-restriction ------------------------------------------------------------ revno: 106493 committer: Chong Yidong branch nick: trunk timestamp: Thu 2011-11-24 00:25:11 +0800 message: Update Coordinates and Windows node of Lisp manual. * doc/lispref/windows.texi (Window Sizes): Move window-top-line, window-left-column, and window-*-pixel-edges to Coordinates and Windows node. (Coordinates and Windows): Restore window-edges doc. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-11-21 07:28:06 +0000 +++ doc/lispref/ChangeLog 2011-11-23 16:25:11 +0000 @@ -1,3 +1,10 @@ +2011-11-23 Chong Yidong + + * windows.texi (Window Sizes): Move window-top-line, + window-left-column, and window-*-pixel-edges to Coordinates and + Windows node. + (Coordinates and Windows): Restore window-edges doc. + 2011-11-21 Martin Rudalics * windows.texi (Windows and Frames, Splitting Windows): Fix === modified file 'doc/lispref/windows.texi' --- doc/lispref/windows.texi 2011-11-21 07:28:06 +0000 +++ doc/lispref/windows.texi 2011-11-23 16:25:11 +0000 @@ -376,7 +376,7 @@ line (@pxref{Mode Line Format}). Emacs provides several functions for finding the height and width of -a window. Except where noted, these heights and widths are reported +a window. Except where noted, Emacs reports window heights and widths as integer numbers of lines and columns respectively. On a graphical display, each ``line'' and ``column'' actually corresponds to the height and width of a ``default'' character specified by the frame's @@ -439,26 +439,6 @@ @code{nil}, it defaults to the selected window. @end defun -@cindex window position - The following functions can be used to determine the position of a -window relative to the window area of its frame: - -@defun window-top-line &optional window -This function returns the distance, in lines, between the top of -@var{window} and the top of the frame's window area. For instance, -the return value is 0 if there is no window above @var{window}. If -@var{window} is omitted or @code{nil}, it defaults to the selected -window. -@end defun - -@defun window-left-column &optional window -This function returns the distance, in columns, between the left edge -of @var{window} and the left edge of the frame's window area. For -instance, the return value is 0 if there is no window to the left of -@var{window}. If @var{window} is omitted or @code{nil}, it defaults -to the selected window. -@end defun - @cindex window body height @cindex body height of a window @cindex window body width @@ -535,45 +515,12 @@ function @code{window-resizable}. @xref{Resizing Windows}. @end defun - The following functions can be used to find a window's size and -position in pixels. Though mostly useful on graphical displays, they -can also be called on text-only terminals, where the screen area of -each text character is taken to be ``one pixel''. - -@defun window-pixel-edges &optional window -This function return a list of pixel coordinates for the edges of -@var{window}. If @var{window} is omitted or @code{nil}, it defaults -to the selected window. - -The return value has the form @code{(@var{left} @var{top} @var{right} -@var{bottom})}. The list elements are, respectively, the X coordinate -of the left window edge, the Y coordinate of the top edge, one more -than the X coordinate of the right edge, and one more than the Y -coordinate of the bottom edge. The origin coordinate @samp{(0,0)} is -taken to be the top left corner of the frame's window area. - -These edge values include the space used by the window's scroll bar, -margins, fringes, header line, and mode line, if any. -@end defun - -@defun window-inside-pixel-edges &optional window -This function is like @code{window-pixel-edges}, except that it -returns the edge coordinates for the window's text area, rather than -the edge coordinates for the window itself. @var{window} must specify -a live window. -@end defun - -@defun window-absolute-pixel-edges &optional window -This function is like @code{window-pixel-edges}, except that it -returns the edge coordinates relative to the top left corner of the -display screen. -@end defun - -@defun window-inside-absolute-pixel-edges &optional window -This function is like @code{window-inside-pixel-edges}, except that it -returns the edge coordinates relative to the top left corner of the -display screen. @var{window} must specify a live window. -@end defun + @xref{Coordinates and Windows}, for more functions that report the +positions of various parts of a window relative to the frame, from +which you can calculate its size. In particular, you can use the +functions @code{window-pixel-edges} and +@code{window-inside-pixel-edges} to find the size in pixels, for +graphical displays. @node Resizing Windows @section Resizing Windows @@ -2976,32 +2923,90 @@ @end group @end example - @node Coordinates and Windows @section Coordinates and Windows - -This section describes how to relate screen coordinates to windows. +@cindex frame-relative coordinate +@cindex coordinate, relative to frame +@cindex window position + + This section describes functions that report the position of a +window. Most of these functions report positions relative to the +window's frame. In this case, the coordinate origin @samp{(0,0)} lies +near the upper left corner of the frame. For technical reasons, on +graphical displays the origin is not located at the exact corner of +the graphical window as it appears on the screen. If Emacs is built +with the GTK+ toolkit, the origin is at the upper left corner of the +frame area used for displaying Emacs windows, below the title-bar, +GTK+ menu bar, and tool bar (since these are drawn by the window +manager and/or GTK+, not by Emacs). But if Emacs is not built with +GTK+, the origin is at the upper left corner of the tool bar (since in +this case Emacs itself draws the tool bar). In both cases, the X and +Y coordinates increase rightward and downward respectively. + + Except where noted, X and Y coordinates are reported in integer +character units, i.e. numbers of lines and columns respectively. On a +graphical display, each ``line'' and ``column'' corresponds to the +height and width of a default character specified by the frame's +default font. + +@defun window-edges &optional window +This function returns a list of the edge coordinates of @var{window}. +If @var{window} is omitted or @code{nil}, it defaults to the selected +window. + +The return value has the form @code{(@var{left} @var{top} @var{right} +@var{bottom})}. These list elements are, respectively, the X +coordinate of the leftmost column occupied by the window, the Y +coordinate of the topmost row, the X coordinate one column to the +right of the rightmost column, and the Y coordinate one row down from +the bottommost row. + +Note that these are the actual outer edges of the window, including +any header line, mode line, scroll bar, fringes, and display margins. +On a text-only terminal, if the window has a neighbor on its right, +its right edge includes the separator line between the window and its +neighbor. +@end defun + +@defun window-inside-edges &optional window +This function is similar to @code{window-edges}, but the returned edge +values are for the text area of the window. They exclude any header +line, mode line, scroll bar, fringes, display margins, and vertical +separator. +@end defun + +@defun window-top-line &optional window +This function returns the Y coordinate of the topmost row of +@var{window}, equivalent to the @var{top} entry in the list returned +by @code{window-edges}. +@end defun + +@defun window-left-column &optional window +This function returns the X coordinate of the leftmost column of +@var{window}, equivalent to the @var{left} entry in the list returned +by @code{window-edges}. +@end defun + + The following functions can be used to relate a set of +frame-relative coordinates to a window: @defun window-at x y &optional frame -This function returns the window containing the specified cursor -position in the frame @var{frame}. The coordinates @var{x} and @var{y} -are measured in characters and count from the top left corner of the -frame. If they are out of range, @code{window-at} returns @code{nil}. - -If you omit @var{frame}, the selected frame is used. +This function returns the live window at the frame-relative +coordinates @var{x} and @var{y}, on frame @var{frame}. If there is no +window at that position, the return value is @code{nil}. If +@var{frame} is omitted or @code{nil}, it defaults to the selected +frame. @end defun @defun coordinates-in-window-p coordinates window -This function checks whether a particular frame position falls within -the window @var{window}. - -The argument @var{coordinates} is a cons cell of the form @code{(@var{x} -. @var{y})}. The coordinates @var{x} and @var{y} are measured in -characters, and count from the top left corner of the screen or frame. - -The value returned by @code{coordinates-in-window-p} is non-@code{nil} -if the coordinates are inside @var{window}. The value also indicates -what part of the window the position is in, as follows: +This function checks whether a window @var{window} occupies the +frame-relative coordinates @var{coordinates}, and if so which part of +the window that is. @var{window} should be a live window. +@var{coordinates} should be a cons cell of the form @code{(@var{x} +. @var{y})}, where @var{x} and @var{y} are frame-relative coordinates. + +If there is no window at the specified position, the return value is +@code{nil} . Otherwise, the return value is one of the following: @table @code @item (@var{relx} . @var{rely}) @@ -3038,6 +3043,44 @@ argument because it always uses the frame that @var{window} is on. @end defun + The following functions return window positions in pixels, rather +than character units. Though mostly useful on graphical displays, +they can also be called on text-only terminals, where the screen area +of each text character is taken to be ``one pixel''. + +@defun window-pixel-edges &optional window +This function returns a list of pixel coordinates for the edges of +@var{window}. If @var{window} is omitted or @code{nil}, it defaults +to the selected window. + +The return value has the form @code{(@var{left} @var{top} @var{right} +@var{bottom})}. The list elements are, respectively, the X pixel +coordinate of the left window edge, the Y pixel coordinate of the top +edge, one more than the X pixel coordinate of the right edge, and one +more than the Y pixel coordinate of the bottom edge. +@end defun + +@defun window-inside-pixel-edges &optional window +This function is like @code{window-pixel-edges}, except that it +returns the pixel coordinates for the edges of the window's text area, +rather than the pixel coordinates for the edges of the window itself. +@var{window} must specify a live window. +@end defun + + The following functions return window positions in pixels, relative +to the display screen rather than the frame: + +@defun window-absolute-pixel-edges &optional window +This function is like @code{window-pixel-edges}, except that it +returns the edge pixel coordinates relative to the top left corner of +the display screen. +@end defun + +@defun window-inside-absolute-pixel-edges &optional window +This function is like @code{window-inside-pixel-edges}, except that it +returns the edge pixel coordinates relative to the top left corner of +the display screen. @var{window} must specify a live window. +@end defun @node Window Configurations @section Window Configurations ------------------------------------------------------------ revno: 106492 committer: Chong Yidong branch nick: trunk timestamp: Thu 2011-11-24 00:09:08 +0800 message: * src/window.c (Fcoordinates_in_window_p): Accept only live windows. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-23 09:57:27 +0000 +++ src/ChangeLog 2011-11-23 16:09:08 +0000 @@ -1,3 +1,7 @@ +2011-11-23 Chong Yidong + + * window.c (Fcoordinates_in_window_p): Accept only live windows. + 2011-11-23 Martin Rudalics * buffer.c (Fkill_buffer): Run replace_buffer_in_windows before === modified file 'src/window.c' --- src/window.c 2011-11-21 06:05:16 +0000 +++ src/window.c 2011-11-23 16:09:08 +0000 @@ -1052,6 +1052,7 @@ DEFUN ("coordinates-in-window-p", Fcoordinates_in_window_p, Scoordinates_in_window_p, 2, 2, 0, doc: /* Return non-nil if COORDINATES are in WINDOW. +WINDOW must be a live window. COORDINATES is a cons of the form (X . Y), X and Y being distances measured in characters from the upper-left corner of the frame. \(0 . 0) denotes the character in the upper left corner of the @@ -1073,7 +1074,7 @@ int x, y; Lisp_Object lx, ly; - CHECK_WINDOW (window); + CHECK_LIVE_WINDOW (window); w = XWINDOW (window); f = XFRAME (w->frame); CHECK_CONS (coordinates); ------------------------------------------------------------ revno: 106491 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-11-23 06:20:43 -0500 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2011-11-23 08:29:08 +0000 +++ lisp/mail/rmail.el 2011-11-23 11:20:43 +0000 @@ -4484,7 +4484,7 @@ ;;;### (autoloads (rmail-next-labeled-message rmail-previous-labeled-message ;;;;;; rmail-read-label rmail-kill-label rmail-add-label) "rmailkwd" -;;;;;; "rmailkwd.el" "08c288c88cfe7be50830122c064e3884") +;;;;;; "rmailkwd.el" "ec13237a2b0a9e9c1893e38d36b11134") ;;; Generated autoloads from rmailkwd.el (autoload 'rmail-add-label "rmailkwd" "\ === modified file 'lisp/ps-print.el' --- lisp/ps-print.el 2011-11-20 11:27:56 +0000 +++ lisp/ps-print.el 2011-11-23 11:20:43 +0000 @@ -6658,7 +6658,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" "afb9022f2e1e366c51672aa11a3bd76f") +;;;;;; ps-multibyte-buffer) "ps-mule" "ps-mule.el" "98fcbceecff2ac603ba35672b99b5278") ;;; Generated autoloads from ps-mule.el (defvar ps-multibyte-buffer nil "\ ------------------------------------------------------------ revno: 106490 committer: martin rudalics branch nick: trunk timestamp: Wed 2011-11-23 10:57:27 +0100 message: In Fkill_buffer do replace_buffer_in_windows before Fset_buffer. (Bug#10114) * buffer.c (Fkill_buffer): Run replace_buffer_in_windows before making another buffer current. (Bug#10114) diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-23 07:09:27 +0000 +++ src/ChangeLog 2011-11-23 09:57:27 +0000 @@ -1,3 +1,8 @@ +2011-11-23 Martin Rudalics + + * buffer.c (Fkill_buffer): Run replace_buffer_in_windows before + making another buffer current. (Bug#10114) + 2011-11-23 Glenn Morris * font.c (font_find_for_lface) [HAVE_NS]: Ignore case. (Bug#2526) === modified file 'src/buffer.c' --- src/buffer.c 2011-11-20 03:48:53 +0000 +++ src/buffer.c 2011-11-23 09:57:27 +0000 @@ -1526,7 +1526,13 @@ UNGCPRO; } - /* Make this buffer not be current. + /* Run replace_buffer_in_windows before making another buffer current + since set-window-buffer-start-and-point will refuse to make another + buffer current if the selected window does not show the current + buffer. (Bug#10114) */ + replace_buffer_in_windows (buffer); + + /* Make this buffer not be current. In the process, notice if this is the sole visible buffer and give up if so. */ if (b == current_buffer) @@ -1566,7 +1572,6 @@ /* These may run Lisp code and into infinite loops (if someone insisted on circular lists) so allow quitting here. */ - replace_buffer_in_windows (buffer); frames_discard_buffer (buffer); clear_charpos_cache (b); ------------------------------------------------------------ revno: 106489 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-11-23 00:48:07 -0800 message: * paths.el (rmail-file-name): Reformat the doc-string so that it is picked up. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-23 08:29:08 +0000 +++ lisp/ChangeLog 2011-11-23 08:48:07 +0000 @@ -4,6 +4,9 @@ 2011-11-23 Glenn Morris + * paths.el (rmail-file-name): Reformat the doc-string so that it + is picked up. + * mail/rmail.el (rmail-message-filter, rmail-auto-file): Doc fixes. (rmail-auto-file): Ignore case in the "special" field names, as mail-fetch-field does for all others. === modified file 'lisp/paths.el' --- lisp/paths.el 2011-01-25 04:08:28 +0000 +++ lisp/paths.el 2011-11-23 08:48:07 +0000 @@ -132,8 +132,12 @@ *The name of your organization, as a string. The `ORGANIZATION' environment variable is used instead if defined.") -(defcustom rmail-file-name (purecopy "~/RMAIL") "\ -Name of user's primary mail file." +;; This is a defcustom, which make-docfile does not recognize in +;; uncompiled Lisp code. If we use the "\ method of writing the doc, +;; it does not get a doc string. Somehow if we write it in the "wrong" +;; (ie normal) way (as below), it does... See also remote-shell-program. +(defcustom rmail-file-name (purecopy "~/RMAIL") + "Name of user's primary mail file." :type 'string :group 'rmail :version "21.1") ------------------------------------------------------------ revno: 106488 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-11-23 00:29:08 -0800 message: Doc fixes related to rmail-automatic-folder-directives. * mail/rmail.el (rmail-message-filter, rmail-auto-file): Doc fixes. (rmail-auto-file): Ignore case in the "special" field names, as mail-fetch-field does for all others. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-23 07:49:53 +0000 +++ lisp/ChangeLog 2011-11-23 08:29:08 +0000 @@ -4,6 +4,10 @@ 2011-11-23 Glenn Morris + * mail/rmail.el (rmail-message-filter, rmail-auto-file): Doc fixes. + (rmail-auto-file): Ignore case in the "special" field names, + as mail-fetch-field does for all others. + * mail/rmail.el (rmail-forward): * mail/rmailkwd.el (rmail-set-label): * mail/rmailout.el (rmail-output, rmail-output-as-seen) === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2011-11-23 07:41:17 +0000 +++ lisp/mail/rmail.el 2011-11-23 08:29:08 +0000 @@ -495,29 +495,36 @@ "23.1") (defcustom rmail-automatic-folder-directives nil - "List of directives specifying where to put a message. + "List of directives specifying how to automatically file messages. +Whenever Rmail shows a message in the folder that `rmail-file-name' +specifies, it calls `rmail-auto-file' to maybe file the message in +another folder according to this list. Messages that are already +marked as `filed', or are in different folders, are left alone. + Each element of the list is of the form: (FOLDERNAME FIELD REGEXP [ FIELD REGEXP ] ... ) -Where FOLDERNAME is the name of a folder to put the message. -If any of the field regexp's are nil, then it is ignored. - -If FOLDERNAME is \"/dev/null\", it is deleted. -If FOLDERNAME is nil then it is deleted, and skipped. - -FIELD is the plain text name of a field in the message, such as -\"subject\" or \"from\". A FIELD of \"to\" will automatically include -all text from the \"cc\" field as well. - -REGEXP is an expression to match in the preceding specified FIELD. -FIELD/REGEXP pairs continue in the list. - -examples: +FOLDERNAME is the name of a folder in which to put the message. +If FOLDERNAME is nil then Rmail deletes the message, and moves on to +the next. If FOLDERNAME is \"/dev/null\", Rmail deletes the message, +but does not move to the next. + +FIELD is the name of a header field in the message, such as +\"subject\" or \"from\". A FIELD of \"to\" includes all text +from both the \"to\" and \"cc\" headers. + +REGEXP is a regular expression to match (case-sensitively) against +the preceding specified FIELD. + +There may be any number of FIELD/REGEXP pairs. +All pairs must match for a directive to apply to a message. +For a given message, Rmail applies only the first matching directive. + +Examples: (\"/dev/null\" \"from\" \"@spam.com\") ; delete all mail from spam.com (\"RMS\" \"from\" \"rms@\") ; save all mail from RMS. - -Note that this is only applied in the folder specifed by `rmail-file-name'." +" :group 'rmail :version "21.1" :type '(repeat (sexp :tag "Directive"))) @@ -2941,8 +2948,11 @@ (cons overlay rmail-overlay-list)))))))))) (defun rmail-auto-file () - "Automatically move a message into a sub-folder based on criteria. -Called when a new message is displayed." + "Automatically move a message into another sfolder based on criteria. +This moves messages according to `rmail-automatic-folder-directives'. +It only does something in the folder that `rmail-file-name' specifies. +The function `rmail-show-message' calls this whenever it shows a message. +This leaves a message alone if it already has the `filed' attribute." (if (or (zerop rmail-total-messages) (rmail-message-attr-p rmail-current-message "...F") (not (string= (buffer-file-name) @@ -2962,10 +2972,14 @@ directive-loop (cdr (car d))) (while (and (car directive-loop) (let ((f (cond - ((string= (car directive-loop) "from") from) - ((string= (car directive-loop) "to") to) - ((string= (car directive-loop) "subject") subj) + ((string= (downcase (car directive-loop)) "from") + from) + ((string= (downcase (car directive-loop)) "to") + to) + ((string= (downcase (car directive-loop)) + "subject") subj) (t (mail-fetch-field (car directive-loop)))))) + ;; FIXME - shouldn't this ignore case? (and f (string-match (car (cdr directive-loop)) f)))) (setq directive-loop (cdr (cdr directive-loop)))) ;; If there are no directives left, then it was a complete match. ------------------------------------------------------------ revno: 106487 fixes bug(s): http://debbugs.gnu.org/7743 author: Mark Lillibridge committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-11-22 23:49:53 -0800 message: * lisp/mail/unrmail.el (unrmail): Always add blank line. (tiny change) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-23 07:41:17 +0000 +++ lisp/ChangeLog 2011-11-23 07:49:53 +0000 @@ -1,3 +1,7 @@ +2011-11-23 Mark Lillibridge (tiny change) + + * mail/unrmail.el (unrmail): Always add blank line. (Bug#7743) + 2011-11-23 Glenn Morris * mail/rmail.el (rmail-forward): === modified file 'lisp/mail/unrmail.el' --- lisp/mail/unrmail.el 2011-01-25 04:08:28 +0000 +++ lisp/mail/unrmail.el 2011-11-23 07:49:53 +0000 @@ -231,10 +231,9 @@ (while (search-forward "\nFrom " nil t) (forward-char -5) (insert ?>))) - ;; Make sure the message ends with two newlines (goto-char (point-max)) - (unless (looking-back "\n\n") - (insert "\n")) + ;; Add terminator blank line to message. + (insert "\n") ;; Write it to the output file, suitably encoded. (let ((coding-system-for-write coding)) (write-region (point-min) (point-max) to-file t