Now on revision 106401. ------------------------------------------------------------ revno: 106401 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-11-16 22:23:50 -0500 message: * doc/emacs/regs.texi (Bookmarks): Small fixes related to saving. (Bug#10058) diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-11-16 17:47:25 +0000 +++ doc/emacs/ChangeLog 2011-11-17 03:23:50 +0000 @@ -1,3 +1,7 @@ +2011-11-17 Glenn Morris + + * regs.texi (Bookmarks): Small fixes related to saving. (Bug#10058) + 2011-11-16 Juanma Barranquero * killing.texi (Rectangles): === modified file 'doc/emacs/regs.texi' --- doc/emacs/regs.texi 2011-11-16 12:34:47 +0000 +++ doc/emacs/regs.texi 2011-11-17 03:23:50 +0000 @@ -278,7 +278,7 @@ bookmarks. Type @kbd{C-h m} in the bookmark buffer for more information about its special editing commands. - When you kill Emacs, Emacs offers to save your bookmark values, if + When you kill Emacs, Emacs saves your bookmarks, if you have changed any bookmark values. You can also save the bookmarks at any time with the @kbd{M-x bookmark-save} command. Bookmarks are saved to the file @file{~/.emacs.d/bookmarks} (for compatibility with @@ -290,9 +290,10 @@ @vindex bookmark-save-flag If you set the variable @code{bookmark-save-flag} to 1, each command that sets a bookmark will also save your bookmarks; this way, you -don't lose any bookmark values even if Emacs crashes. (The value, if +don't lose any bookmark values even if Emacs crashes. The value, if a number, says how many bookmark modifications should go by between -saving.) +saving. If you set this variable to @code{nil}, Emacs only +saves bookmarks if you explicitly use @kbd{M-x bookmark-save}. @vindex bookmark-search-size Bookmark position values are saved with surrounding context, so that ------------------------------------------------------------ revno: 106400 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-11-16 21:38:54 -0500 message: Small fix for sh-font-lock-keywords-var bash entry. * lisp/progmodes/sh-script.el (sh-font-lock-keywords-var): Make bash entry derive from sh entry, not shell entry. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-16 21:32:46 +0000 +++ lisp/ChangeLog 2011-11-17 02:38:54 +0000 @@ -1,3 +1,8 @@ +2011-11-17 Glenn Morris + + * progmodes/sh-script.el (sh-font-lock-keywords-var): + Make bash entry derive from sh entry, not shell entry. + 2011-11-16 Michael Albinus * net/tramp.el (tramp-handle-file-truename): Cache only the local === modified file 'lisp/progmodes/sh-script.el' --- lisp/progmodes/sh-script.el 2011-08-22 22:10:21 +0000 +++ lisp/progmodes/sh-script.el 2011-11-17 02:38:54 +0000 @@ -889,7 +889,7 @@ font-lock-variable-name-face)) (rc sh-append es) - (bash sh-append shell ("\\$(\\(\\sw+\\)" (1 'sh-quoted-exec t) )) + (bash sh-append sh ("\\$(\\(\\sw+\\)" (1 'sh-quoted-exec t) )) (sh sh-append shell ;; Variable names. ("\\$\\({#?\\)?\\([[:alpha:]_][[:alnum:]_]*\\|[-#?@!]\\)" 2 ------------------------------------------------------------ revno: 106399 committer: Michael Albinus branch nick: trunk timestamp: Wed 2011-11-16 22:32:46 +0100 message: * 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) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-16 18:21:51 +0000 +++ lisp/ChangeLog 2011-11-16 21:32:46 +0000 @@ -1,3 +1,11 @@ +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) + 2011-11-16 Juanma Barranquero * menu-bar.el (menu-bar-file-menu): === modified file 'lisp/net/tramp-cache.el' --- lisp/net/tramp-cache.el 2011-10-23 15:59:54 +0000 +++ lisp/net/tramp-cache.el 2011-11-16 21:32:46 +0000 @@ -162,6 +162,11 @@ ;;;###tramp-autoload (defun tramp-flush-file-property (vec file) "Remove all properties of FILE in the cache context of VEC." + ;; Remove file property of symlinks. + (let ((truename (tramp-get-file-property vec file "file-truename" nil))) + (when (and (stringp truename) + (not (string-equal file truename))) + (tramp-flush-file-property vec truename))) ;; Unify localname. (setq vec (copy-sequence vec)) (aset vec 3 (tramp-run-real-handler 'directory-file-name (list file))) === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2011-11-14 23:59:56 +0000 +++ lisp/net/tramp-sh.el 2011-11-16 21:32:46 +0000 @@ -1058,106 +1058,110 @@ (defun tramp-sh-handle-file-truename (filename &optional counter prev-dirs) "Like `file-truename' for Tramp files." (with-parsed-tramp-file-name (expand-file-name filename) nil - (with-file-property v localname "file-truename" - (let ((result nil)) ; result steps in reverse order - (tramp-message v 4 "Finding true name for `%s'" filename) - (cond - ;; Use GNU readlink --canonicalize-missing where available. - ((tramp-get-remote-readlink v) - (setq result - (tramp-send-command-and-read - v - (format "echo \"\\\"`%s --canonicalize-missing %s`\\\"\"" - (tramp-get-remote-readlink v) - (tramp-shell-quote-argument localname))))) - - ;; Use Perl implementation. - ((and (tramp-get-remote-perl v) - (tramp-get-connection-property v "perl-file-spec" nil) - (tramp-get-connection-property v "perl-cwd-realpath" nil)) - (tramp-maybe-send-script - v tramp-perl-file-truename "tramp_perl_file_truename") - (setq result - (tramp-send-command-and-read - v - (format "tramp_perl_file_truename %s" - (tramp-shell-quote-argument localname))))) - - ;; Do it yourself. We bind `directory-sep-char' here for - ;; XEmacs on Windows, which would otherwise use backslash. - (t (let* ((directory-sep-char ?/) - (steps (tramp-compat-split-string localname "/")) - (localnamedir (tramp-run-real-handler - 'file-name-as-directory (list localname))) - (is-dir (string= localname localnamedir)) - (thisstep nil) - (numchase 0) - ;; Don't make the following value larger than - ;; necessary. People expect an error message in a - ;; timely fashion when something is wrong; - ;; otherwise they might think that Emacs is hung. - ;; Of course, correctness has to come first. - (numchase-limit 20) - symlink-target) - (while (and steps (< numchase numchase-limit)) - (setq thisstep (pop steps)) - (tramp-message - v 5 "Check %s" - (mapconcat 'identity - (append '("") (reverse result) (list thisstep)) - "/")) - (setq symlink-target - (nth 0 (file-attributes - (tramp-make-tramp-file-name - method user host - (mapconcat 'identity - (append '("") - (reverse result) - (list thisstep)) - "/"))))) - (cond ((string= "." thisstep) - (tramp-message v 5 "Ignoring step `.'")) - ((string= ".." thisstep) - (tramp-message v 5 "Processing step `..'") - (pop result)) - ((stringp symlink-target) - ;; It's a symlink, follow it. - (tramp-message v 5 "Follow symlink to %s" symlink-target) - (setq numchase (1+ numchase)) - (when (file-name-absolute-p symlink-target) - (setq result nil)) - ;; If the symlink was absolute, we'll get a string like - ;; "/user@host:/some/target"; extract the - ;; "/some/target" part from it. - (when (tramp-tramp-file-p symlink-target) - (unless (tramp-equal-remote filename symlink-target) - (tramp-error - v 'file-error - "Symlink target `%s' on wrong host" symlink-target)) - (setq symlink-target localname)) - (setq steps - (append (tramp-compat-split-string - symlink-target "/") - steps))) - (t - ;; It's a file. - (setq result (cons thisstep result))))) - (when (>= numchase numchase-limit) - (tramp-error - v 'file-error - "Maximum number (%d) of symlinks exceeded" numchase-limit)) - (setq result (reverse result)) - ;; Combine list to form string. - (setq result - (if result - (mapconcat 'identity (cons "" result) "/") - "/")) - (when (and is-dir (or (string= "" result) - (not (string= (substring result -1) "/")))) - (setq result (concat result "/")))))) - - (tramp-message v 4 "True name of `%s' is `%s'" filename result) - (tramp-make-tramp-file-name method user host result))))) + (tramp-make-tramp-file-name method user host + (with-file-property v localname "file-truename" + (let ((result nil)) ; result steps in reverse order + (tramp-message v 4 "Finding true name for `%s'" filename) + (cond + ;; Use GNU readlink --canonicalize-missing where available. + ((tramp-get-remote-readlink v) + (setq result + (tramp-send-command-and-read + v + (format "echo \"\\\"`%s --canonicalize-missing %s`\\\"\"" + (tramp-get-remote-readlink v) + (tramp-shell-quote-argument localname))))) + + ;; Use Perl implementation. + ((and (tramp-get-remote-perl v) + (tramp-get-connection-property v "perl-file-spec" nil) + (tramp-get-connection-property v "perl-cwd-realpath" nil)) + (tramp-maybe-send-script + v tramp-perl-file-truename "tramp_perl_file_truename") + (setq result + (tramp-send-command-and-read + v + (format "tramp_perl_file_truename %s" + (tramp-shell-quote-argument localname))))) + + ;; Do it yourself. We bind `directory-sep-char' here for + ;; XEmacs on Windows, which would otherwise use backslash. + (t (let* ((directory-sep-char ?/) + (steps (tramp-compat-split-string localname "/")) + (localnamedir (tramp-run-real-handler + 'file-name-as-directory (list localname))) + (is-dir (string= localname localnamedir)) + (thisstep nil) + (numchase 0) + ;; Don't make the following value larger than + ;; necessary. People expect an error message in + ;; a timely fashion when something is wrong; + ;; otherwise they might think that Emacs is hung. + ;; Of course, correctness has to come first. + (numchase-limit 20) + symlink-target) + (while (and steps (< numchase numchase-limit)) + (setq thisstep (pop steps)) + (tramp-message + v 5 "Check %s" + (mapconcat 'identity + (append '("") (reverse result) (list thisstep)) + "/")) + (setq symlink-target + (nth 0 (file-attributes + (tramp-make-tramp-file-name + method user host + (mapconcat 'identity + (append '("") + (reverse result) + (list thisstep)) + "/"))))) + (cond ((string= "." thisstep) + (tramp-message v 5 "Ignoring step `.'")) + ((string= ".." thisstep) + (tramp-message v 5 "Processing step `..'") + (pop result)) + ((stringp symlink-target) + ;; It's a symlink, follow it. + (tramp-message + v 5 "Follow symlink to %s" symlink-target) + (setq numchase (1+ numchase)) + (when (file-name-absolute-p symlink-target) + (setq result nil)) + ;; If the symlink was absolute, we'll get a + ;; string like "/user@host:/some/target"; + ;; extract the "/some/target" part from it. + (when (tramp-tramp-file-p symlink-target) + (unless (tramp-equal-remote filename symlink-target) + (tramp-error + v 'file-error + "Symlink target `%s' on wrong host" + symlink-target)) + (setq symlink-target localname)) + (setq steps + (append (tramp-compat-split-string + symlink-target "/") + steps))) + (t + ;; It's a file. + (setq result (cons thisstep result))))) + (when (>= numchase numchase-limit) + (tramp-error + v 'file-error + "Maximum number (%d) of symlinks exceeded" numchase-limit)) + (setq result (reverse result)) + ;; Combine list to form string. + (setq result + (if result + (mapconcat 'identity (cons "" result) "/") + "/")) + (when (and is-dir + (or (string= "" result) + (not (string= (substring result -1) "/")))) + (setq result (concat result "/")))))) + + (tramp-message v 4 "True name of `%s' is `%s'" localname result) + result))))) ;; Basic functions. ------------------------------------------------------------ revno: 106398 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-11-16 10:21:51 -0800 message: ChangeLog fixes: python-pdbtrack-stack-entry-regexp was not changed. Mark an odd kind of change with no real attribution as tiny. Remove conflict marker. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-16 17:47:25 +0000 +++ lisp/ChangeLog 2011-11-16 18:21:51 +0000 @@ -20,22 +20,15 @@ 2011-11-16 Ken Manheimer - * allout-widgets.el: (file metadata): Attribute copyright to FSF - and collapse date sequence, obscure author/maintainer email - address better, remove extra version line, track relocation of - author's allout webpage. - - * allout.el: (file metadata): Attribute copyright to FSF - and collapse date sequence, obscure author/maintainer email - address better, track relocation of author's allout webpage. - -2011-11-16 Ken Manheimer - - * python.el (python-pdbtrack-stack-entry-regexp) - (python-pdbtrack-input-prompt, python-pdbtrack-track-stack-file): - Adjust to recognize ipdb as well as regular python pdb prompts. - Adjustments shamelessly taken exactly as suggested in EmacsWiki - page: http://www.emacswiki.org/PythonProgrammingInEmacs#toc14 + * allout.el, allout-widgets.el (file metadata): Attribute copyright to + FSF and collapse date sequence, obscure author/maintainer email address + better, remove extra version line, track relocation of author's webpage. + + * progmodes/python.el (python-pdbtrack-input-prompt) + (python-pdbtrack-track-stack-file): Adjust to recognize ipdb as well as + regular python pdb prompts. Adjustments shamelessly taken exactly as + suggested in EmacsWiki page (tiny change): + http://www.emacswiki.org/PythonProgrammingInEmacs#toc14 2011-11-16 Juanma Barranquero @@ -86,7 +79,6 @@ which wasn't being used. Add optional arg to force given state. (rmail-mime): Add optional arg to force given state. ->>>>>>> MERGE-SOURCE 2011-11-15 Juanma Barranquero * allout.el (allout-encryption-plaintext-sanitization-regexps): ------------------------------------------------------------ revno: 106397 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2011-11-16 18:47:25 +0100 message: Fix typos. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2011-11-15 18:08:38 +0000 +++ admin/ChangeLog 2011-11-16 17:47:25 +0000 @@ -1,7 +1,10 @@ +2011-11-16 Juanma Barranquero + + * admin.el (manual-dvi): Fix typo. + 2011-11-15 Eli Zaretskii - * nt/README-ftp-server: Update the information about PNG - libraries. + * nt/README-ftp-server: Update the information about PNG libraries. 2011-11-15 Juanma Barranquero === modified file 'admin/admin.el' --- admin/admin.el 2011-09-26 03:02:21 +0000 +++ admin/admin.el 2011-11-16 17:47:25 +0000 @@ -330,7 +330,7 @@ (defun manual-dvi (texi-file dest ps-dest) "Run texi2dvi on TEXI-FILE, emitting dvi output to DEST. -Also generate postscript output in PS-DEST." +Also generate PostScript output in PS-DEST." (call-process "texi2dvi" nil nil nil texi-file "-o" dest) (call-process "dvips" nil nil nil dest "-o" ps-dest) (call-process "gzip" nil nil nil dest) === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-11-16 12:34:47 +0000 +++ doc/emacs/ChangeLog 2011-11-16 17:47:25 +0000 @@ -1,6 +1,9 @@ 2011-11-16 Juanma Barranquero * killing.texi (Rectangles): + * misc.texi (Document View): + * modes.texi (Choosing Modes): + * msdog.texi (Windows Fonts): * regs.texi (Rectangle Registers): * search.texi (Isearch Yank): Fix typos. === modified file 'doc/emacs/misc.texi' --- doc/emacs/misc.texi 2011-10-06 15:13:45 +0000 +++ doc/emacs/misc.texi 2011-11-16 17:47:25 +0000 @@ -236,7 +236,7 @@ @cindex DVI file @cindex PDF file @cindex PS file -@cindex Postscript file +@cindex PostScript file @cindex OpenDocument file @cindex Microsoft Office file @cindex DocView mode @@ -244,7 +244,7 @@ @cindex document viewer (DocView) @findex doc-view-mode -DocView mode (@code{doc-view-mode}) is a viewer for DVI, Postscript +DocView mode (@code{doc-view-mode}) is a viewer for DVI, PostScript (PS), PDF, OpenDocument, and Microsoft Office documents. It provides features such as slicing, zooming, and searching inside documents. It works by converting the document to a set of images using the @@ -257,16 +257,16 @@ @findex doc-view-toggle-display @findex doc-view-toggle-display @cindex doc-view-minor-mode - When you visit a document file with the exception of Postscript + When you visit a document file with the exception of PostScript files, Emacs automatically switches to DocView mode if possible @footnote{The needed external tools for this document type have to be available, emacs needs to run in a graphical frame, and PNG image support has to be compiled into emacs. If any of these requirements is not fulfilled, DocView falls back to an appropriate mode.}. When -you visit a Postscript file, Emacs switches to PS mode, a major mode -for editing Postscript files as text; however, it also enables DocView +you visit a PostScript file, Emacs switches to PS mode, a major mode +for editing PostScript files as text; however, it also enables DocView minor mode, so you can type @kbd{C-c C-c} to view the document with -DocView. (PDF and DVI files, unlike Postscript files, are not usually +DocView. (PDF and DVI files, unlike PostScript files, are not usually human-editable.) In either case, repeating @kbd{C-c C-c} (@code{doc-view-toggle-display}) toggles between DocView and the file text. === modified file 'doc/emacs/modes.texi' --- doc/emacs/modes.texi 2011-08-29 22:02:21 +0000 +++ doc/emacs/modes.texi 2011-11-16 17:47:25 +0000 @@ -368,7 +368,7 @@ @code{magic-mode-alist}, described above, except that is consulted only after @code{auto-mode-alist}. By default, @code{magic-fallback-mode-alist} contains forms that check for image -files, HTML/XML/SGML files, and Postscript files. +files, HTML/XML/SGML files, and PostScript files. @vindex major-mode Once a major mode is chosen, Emacs sets the value of the variable === modified file 'doc/emacs/msdog.texi' --- doc/emacs/msdog.texi 2011-07-12 01:38:28 +0000 +++ doc/emacs/msdog.texi 2011-11-16 17:47:25 +0000 @@ -868,7 +868,7 @@ @code{gdi} font backend is available on all versions of Windows, and supports all fonts that are natively supported by Windows. The @code{uniscribe} font backend is available on Windows 2000 and later, -and supports Truetype and Opentype fonts. Some languages requiring +and supports TrueType and OpenType fonts. Some languages requiring complex layout can only be properly supported by the uniscribe backend. By default, both backends are enabled if supported, with @code{uniscribe} taking priority over @code{gdi}. @@ -914,7 +914,7 @@ @vindex w32-charset-info-alist @item registry Specifies the character set registry that the font is -expected to cover. Most Truetype and Opentype fonts will be unicode fonts +expected to cover. Most TrueType and OpenType fonts will be unicode fonts that cover several national character sets, but you can narrow down the selection of fonts to those that support a particular character set by using a specific registry from @code{w32-charset-info-alist} here. === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2011-04-06 12:18:10 +0000 +++ doc/lispintro/ChangeLog 2011-11-16 17:47:25 +0000 @@ -1,3 +1,7 @@ +2011-11-16 Juanma Barranquero + + * emacs-lisp-intro.texi (etags): Fix typo. + 2011-03-07 Chong Yidong * Version 23.3 released. === modified file 'doc/lispintro/emacs-lisp-intro.texi' --- doc/lispintro/emacs-lisp-intro.texi 2011-11-14 20:23:26 +0000 +++ doc/lispintro/emacs-lisp-intro.texi 2011-11-16 17:47:25 +0000 @@ -11,7 +11,7 @@ @c --------- @c <<<< For hard copy printing, this file is now @c set for smallbook, which works for all sizes -@c of paper, and with Postscript figures >>>> +@c of paper, and with PostScript figures >>>> @set smallbook @ifset smallbook @smallbook @@ -13656,7 +13656,7 @@ The @code{etags} program handles more than 20 languages, including Emacs Lisp, Common Lisp, Scheme, C, C++, Ada, Fortran, HTML, Java, -LaTeX, Pascal, Perl, Postscript, Python, TeX, Texinfo, makefiles, and +LaTeX, Pascal, Perl, PostScript, Python, TeX, Texinfo, makefiles, and most assemblers. The program has no switches for specifying the language; it recognizes the language in an input file according to its file name and contents. === modified file 'doc/man/ChangeLog' --- doc/man/ChangeLog 2011-11-15 17:37:37 +0000 +++ doc/man/ChangeLog 2011-11-16 17:47:25 +0000 @@ -1,3 +1,7 @@ +2011-11-16 Juanma Barranquero + + * etags.1: Fix typo. + 2011-10-06 Chong Yidong * emacsclient.1: Document how -a "" starts the daemon. === modified file 'doc/man/etags.1' --- doc/man/etags.1 2011-01-15 23:16:57 +0000 +++ doc/man/etags.1 2011-11-16 17:47:25 +0000 @@ -49,7 +49,7 @@ \&. Both forms of the program understand the syntax of C, Objective C, C++, Java, Fortran, Ada, Cobol, Erlang, Forth, HTML, LaTeX, Emacs Lisp/Common Lisp, Lua, Makefile, Pascal, Perl, -PHP, Postscript, Python, Prolog, Scheme and +PHP, PostScript, Python, Prolog, Scheme and most assembler\-like syntaxes. Both forms read the files specified on the command line, and write a tag table (defaults: \fBTAGS\fP for \fBetags\fP, \fBtags\fP for === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-11-16 12:34:47 +0000 +++ doc/misc/ChangeLog 2011-11-16 17:47:25 +0000 @@ -1,3 +1,7 @@ +2011-11-16 Juanma Barranquero + + * org.texi (Agenda commands, Exporting Agenda Views): Fix typos. + 2011-11-15 Juanma Barranquero * ede.texi (project-am-texinfo): === modified file 'doc/misc/org.texi' --- doc/misc/org.texi 2011-11-15 17:37:37 +0000 +++ doc/misc/org.texi 2011-11-16 17:47:25 +0000 @@ -8262,7 +8262,7 @@ @vindex org-agenda-exporter-settings Write the agenda view to a file. Depending on the extension of the selected file name, the view will be exported as HTML (extension @file{.html} or -@file{.htm}), Postscript (extension @file{.ps}), PDF (extension @file{.pdf}), +@file{.htm}), PostScript (extension @file{.ps}), PDF (extension @file{.pdf}), and plain text (any other extension). When called with a @kbd{C-u} prefix argument, immediately open the newly created file. Use the variable @code{org-agenda-exporter-settings} to set options for @file{ps-print} and @@ -8477,9 +8477,9 @@ If you are away from your computer, it can be very useful to have a printed version of some agenda views to carry around. Org-mode can export custom agenda views as plain text, HTML@footnote{You need to install Hrvoje Niksic's -@file{htmlize.el}.}, Postscript, PDF@footnote{To create PDF output, the +@file{htmlize.el}.}, PostScript, PDF@footnote{To create PDF output, the ghostscript @file{ps2pdf} utility must be installed on the system. Selecting -a PDF file will also create the postscript file.}, and iCalendar files. If +a PDF file will also create the PostScript file.}, and iCalendar files. If you want to do this only occasionally, use the command @table @kbd @@ -8489,7 +8489,7 @@ @vindex org-agenda-exporter-settings Write the agenda view to a file. Depending on the extension of the selected file name, the view will be exported as HTML (extension @file{.html} or -@file{.htm}), Postscript (extension @file{.ps}), iCalendar (extension +@file{.htm}), PostScript (extension @file{.ps}), iCalendar (extension @file{.ics}), or plain text (any other extension). Use the variable @code{org-agenda-exporter-settings} to set options for @file{ps-print} and for @file{htmlize} to be used during export, for example @@ -8542,7 +8542,7 @@ @file{.html}, Org-mode will use the @file{htmlize.el} package to convert the buffer to HTML and save it to this file name. If the extension is @file{.ps}, @code{ps-print-buffer-with-faces} is used to produce -Postscript output. If the extension is @file{.ics}, iCalendar export is +PostScript output. If the extension is @file{.ics}, iCalendar export is run export over all files that were used to construct the agenda, and limit the export to entries listed in the agenda. Any other extension produces a plain ASCII file. @@ -8573,7 +8573,7 @@ @end lisp @noindent -This command sets two options for the Postscript exporter, to make it +This command sets two options for the PostScript exporter, to make it print in two columns in landscape format---the resulting page can be cut in two and then used in a paper agenda. The remaining settings modify the agenda prefix to omit category and scheduling information, and === modified file 'etc/NEWS.19' --- etc/NEWS.19 2011-01-26 08:36:39 +0000 +++ etc/NEWS.19 2011-11-16 17:47:25 +0000 @@ -1729,7 +1729,7 @@ use of etags and TAGS files for languages not supported by etags. The Emacs manual section on Tags contains explanations and examples -for Emacs's DEFVAR, VHDL, Cobol, Postscript and TCL. +for Emacs's DEFVAR, VHDL, Cobol, PostScript and TCL. ** Various mode-specific commands that used to be bound to C-c LETTER have been moved. === modified file 'etc/NEWS.20' --- etc/NEWS.20 2011-11-11 10:04:08 +0000 +++ etc/NEWS.20 2011-11-16 17:47:25 +0000 @@ -696,7 +696,7 @@ ** You can specify the printer to use for commands that do printing by setting the variable `printer-name'. Just what a printer name looks like depends on your operating system. You can specify a different -printer for the Postscript printing commands by setting +printer for the PostScript printing commands by setting `ps-printer-name'. ** Emacs now supports on-the-fly spell checking by the means of a @@ -3494,9 +3494,9 @@ *** Java is tagged like C++. In addition, "extends" and "implements" constructs are tagged. Files are recognized by the extension .java. -*** Etags can now handle programs written in Postscript. Files are -recognized by the extensions .ps and .pdb (Postscript with C syntax). -In Postscript, tags are lines that start with a slash. +*** Etags can now handle programs written in PostScript. Files are +recognized by the extensions .ps and .pdb (PostScript with C syntax). +In PostScript, tags are lines that start with a slash. *** Etags now handles Objective C and Objective C++ code. The usual C and C++ tags are recognized in these languages; in addition, etags === modified file 'etc/NEWS.21' --- etc/NEWS.21 2011-11-15 07:55:13 +0000 +++ etc/NEWS.21 2011-11-16 17:47:25 +0000 @@ -446,7 +446,7 @@ ** Polish, Czech, German, and French translations of Emacs' reference card have been added. They are named `pl-refcard.tex', `cs-refcard.tex', -`de-refcard.tex' and `fr-refcard.tex'. Postscript files are included. +`de-refcard.tex' and `fr-refcard.tex'. PostScript files are included. ** An `Emacs Survival Guide', etc/survival.tex, is available. @@ -2189,7 +2189,7 @@ *** New language Python: def and class at the beginning of a line are tags. -*** .ss files are Scheme files, .pdb is Postscript with C syntax, .psw is +*** .ss files are Scheme files, .pdb is PostScript with C syntax, .psw is for PSWrap. ** Changes in etags.el === modified file 'etc/NEWS.23' --- etc/NEWS.23 2011-11-14 23:59:56 +0000 +++ etc/NEWS.23 2011-11-16 17:47:25 +0000 @@ -1235,8 +1235,8 @@ PDF and DVI files are now opened in Doc View mode by default. -In Postcript mode, C-c C-c launches Doc View minor mode for viewing -the postscript file. +In PostScript mode, C-c C-c launches Doc View minor mode for viewing +the PostScript file. ** EasyPG provides an interface to the GNU Privacy Guard (GnuPG). It includes a GnuPG keyring browser, cryptographic operations on === modified file 'etc/TODO' --- etc/TODO 2011-11-14 20:23:26 +0000 +++ etc/TODO 2011-11-16 17:47:25 +0000 @@ -325,7 +325,7 @@ ** Beefed-up syntax-tables. *** recognize multi-character syntactic entities like `begin' and `end'. -*** nested string-delimiters (for Postscript's (foo(bar)baz) strings). +*** nested string-delimiters (for PostScript's (foo(bar)baz) strings). *** support for infix operators (with precedence). *** support for the $ (paired delimiter) in parse-partial-sexp. *** support for hook-chars whose effect on the parsing-state is specified === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2011-11-16 12:34:47 +0000 +++ lib-src/ChangeLog 2011-11-16 17:47:25 +0000 @@ -4634,9 +4634,9 @@ 1997-05-12 Francesco Potortì - * etags.c (Cplusplus_suffixes): .pdb is Postscript with C syntax. - (Postscript_suffixes): .ps is Postscript. - (lang_names): Add Postscript. + * etags.c (Cplusplus_suffixes): .pdb is PostScript with C syntax. + (Postscript_suffixes): .ps is PostScript. + (lang_names): Add postscript. (Postscript_functions): New function. (TEX_decode_env): Close minor memory leak. (just_read_file): Correct the char number of the tag. === modified file 'lib-src/etags.c' --- lib-src/etags.c 2011-11-13 07:48:23 +0000 +++ lib-src/etags.c 2011-11-16 17:47:25 +0000 @@ -611,7 +611,7 @@ static const char *Cplusplus_suffixes [] = { "C", "c++", "cc", "cpp", "cxx", "H", "h++", "hh", "hpp", "hxx", "M", /* Objective C++ */ - "pdb", /* Postscript with C syntax */ + "pdb", /* PostScript with C syntax */ NULL }; static const char Cplusplus_help [] = "In C++ code, all the tag constructs of C code are tagged. (Use\n\ @@ -4846,7 +4846,7 @@ /* - * Postscript tags + * PostScript tags * Just look for lines where the first character is '/' * Also look at "defineps" for PSWrap * Ideas by: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-16 16:47:28 +0000 +++ lisp/ChangeLog 2011-11-16 17:47:25 +0000 @@ -1,3 +1,23 @@ +2011-11-16 Juanma Barranquero + + * menu-bar.el (menu-bar-file-menu): + * printing.el (pr-ps-utility): + * calendar/icalendar.el (icalendar, icalendar--convert-tz-offset) + (icalendar--convert-to-ical, icalendar--convert-ordinary-to-ical) + (icalendar--convert-weekly-to-ical, icalendar--convert-yearly-to-ical) + (icalendar--convert-sexp-to-ical, icalendar--convert-block-to-ical) + (icalendar--convert-float-to-ical, icalendar--convert-date-to-ical) + (icalendar--convert-cyclic-to-ical) + (icalendar--convert-anniversary-to-ical, icalendar-import-buffer) + (icalendar--convert-ical-to-diary) + (icalendar--convert-recurring-to-diary) + (icalendar--convert-non-recurring-all-day-to-diary) + (icalendar-import-format-sample): + * progmodes/idlw-shell.el (idlwave-shell-mode): + * progmodes/vhdl-mode.el (vhdl-mode, vhdl-print-two-column) + (vhdl-print-customize-faces, vhdl-mode, vhdl-ps-print-settings) + (vhdl-ps-print-init): Fix typos. + 2011-11-16 Ken Manheimer * allout-widgets.el: (file metadata): Attribute copyright to FSF @@ -497,7 +517,7 @@ * progmodes/cc-defs.el: Update "virtual semicolon" comments. * progmodes/cc-engine.el (c-crosses-statement-barrier-p): - Recode to scan one line at time rather than having \n and \r + Recode to scan one line at a time rather than having \n and \r explicitly in c-stmt-delim-chars (for some modes, e.g. AWK). (c-forward-label): Amend for virtual semicolons. (c-at-macro-vsemi-p, c-macro-vsemi-status-unknown-p): New functions. === modified file 'lisp/ChangeLog.10' --- lisp/ChangeLog.10 2011-11-16 12:34:47 +0000 +++ lisp/ChangeLog.10 2011-11-16 17:47:25 +0000 @@ -2339,7 +2339,7 @@ skips encoded regions. Allow user to skip saving Fcc messages with large attachments. Fixed region skipping bug with multi-line comments - e.g. tex $ regions spanning multiple lines. - Added support for postscript and uuencoded regions. + Added support for PostScript and uuencoded regions. Redundant dictionary file names purged. Dictionary definition field name changed from "Character Set" to "Coding System". Fixed bug in reloading dictionaries. @@ -2374,7 +2374,7 @@ (ispell-valid-dictionary-list): New function returning all valid dictionaries on machine. (ispell-checking-message): Documentation string improved. - (ispell-skip-region-alist): Add uuencoded and postscript region + (ispell-skip-region-alist): Add uuencoded and PostScript region skipping. Improve http/e-mail/file regexp to not match `/.\w'. (ispell-html-skip-alists): New variable for html region support. (ispell-send-string): Remove redundant xemacs check. @@ -2402,7 +2402,7 @@ html skipping pushed to alists. (ispell-get-line): Add support for multi-line comment regions. (ispell): Check that variables to continue spelling are bound. - (ispell-message-text-end): Postscript and uuencoded regions now + (ispell-message-text-end): PostScript and uuencoded regions now supported as MIME regions, rather than as end-of-message region. (ispell-mime-multipartp): New function supporting MIME. (ispell-mime-skip-part): New function supporting MIME. === modified file 'lisp/ChangeLog.12' --- lisp/ChangeLog.12 2011-11-16 12:34:47 +0000 +++ lisp/ChangeLog.12 2011-11-16 17:47:25 +0000 @@ -938,7 +938,7 @@ 2007-03-20 David Kastrup * files.el (magic-mode-alist): Require literal "%!PS" string for - magic postscript file detection. + magic PostScript file detection. 2007-03-20 Richard Stallman === modified file 'lisp/ChangeLog.13' --- lisp/ChangeLog.13 2011-11-15 17:37:37 +0000 +++ lisp/ChangeLog.13 2011-11-16 17:47:25 +0000 @@ -16,7 +16,7 @@ * international/fontset.el (script-representative-chars): Add cham and tai-viet. (setup-default-fontset): Add iso10646-1 font for latin and ipa. - Add fontconfig spec for cjk-misc. Explicitly specify font font + Add fontconfig spec for cjk-misc. Explicitly specify font for U+E000..U+F8FF. * international/characters.el (script-list): Add cham. @@ -16414,7 +16414,7 @@ 2007-05-16 Stefan Monnier * files.el (magic-mode-alist, magic-fallback-mode-alist): - Move the *ml, Postscript, and XmCD entries to the fallback part. + Move the *ml, PostScript, and XmCD entries to the fallback part. * files.el (magic-fallback-mode-alist): Rename from file-start-mode-alist. === modified file 'lisp/ChangeLog.14' --- lisp/ChangeLog.14 2011-11-15 17:37:37 +0000 +++ lisp/ChangeLog.14 2011-11-16 17:47:25 +0000 @@ -2885,11 +2885,11 @@ 2009-01-25 Craig Markwardt * calendar/icalendar.el (icalendar-uid-format): New defcustom - variable to allow the user to choose icalendar UID format. + variable to allow the user to choose iCalendar UID format. (icalendar--diarytime-to-isotime): Bug fix, now times in the range 12:00am-12:59am are correctly converted to 0000-0059, instead of 12pm. (icalendar-export-region, icalendar--create-uid): Use custom - function to compute icalendar UID for each entry. + function to compute iCalendar UID for each entry. (icalendar--parse-summary-and-rest): Bug fix for parsing of lines with description, location, etc. fields (need to keep active count of fields encountered). Another bug fix to the regex that matches === modified file 'lisp/ChangeLog.5' --- lisp/ChangeLog.5 2011-11-15 17:37:37 +0000 +++ lisp/ChangeLog.5 2011-11-16 17:47:25 +0000 @@ -196,7 +196,7 @@ (ispell-required-version): Documentation changes. (ispell-skip-sgml): Documentation changes. (ispell-command-loop): `mode-line-format' now shows misspelled word. - (ispell-message-text-end): Can now process postscript version 1. + (ispell-message-text-end): Can now process PostScript version 1. (ispell-message-start-skip): New variable for block skips, set up for pgp and forward blocks. (ispell-message-end-skip): New variable for block skips, set up for @@ -5507,7 +5507,7 @@ 1994-10-26 Michael Ernst - * ispell.el (ispell-message-text-end): Match Postscript 3 like 2. + * ispell.el (ispell-message-text-end): Match PostScript 3 like 2. 1994-10-26 Ed Reingold === modified file 'lisp/ChangeLog.7' --- lisp/ChangeLog.7 2011-11-15 17:37:37 +0000 +++ lisp/ChangeLog.7 2011-11-16 17:47:25 +0000 @@ -22110,7 +22110,7 @@ 1996-09-27 Jacques Duthen * ps-print.el - (ps-print-prologue-1): Fix bug in postscript comment lines. + (ps-print-prologue-1): Fix bug in PostScript comment lines. (ps-nb-pages): Call ps-setup _before_ switching to the other buffer, because of buffer variables. @@ -22123,7 +22123,7 @@ (ps-page-height-i, ps-page-width-i): Variables deleted. (ps-print-prologue): Variable deleted. (ps-print-prologue-1, ps-print-prologue-2): New variables. - Major rewrite of the postscript code to handle landscape mode, + Major rewrite of the PostScript code to handle landscape mode, multiple columns and new font management. (ps-landscape-mode, ps-number-of-columns, ps-inter-column): New variables. @@ -22136,7 +22136,7 @@ (ps-header-font, ps-landscape-page-height): New internal variables. (ps-top-margin): Change its semantics. It is now really the top margin, not anymore twice the top margin. - (/ReportAllFontInfo): New postscript function to get all the font + (/ReportAllFontInfo): New PostScript function to get all the font families of the printer. (ps-setup): New function. (ps-line-lengths, ps-nb-pages-buffer, ps-nb-pages-region): New === modified file 'lisp/ChangeLog.8' --- lisp/ChangeLog.8 2011-11-15 17:37:37 +0000 +++ lisp/ChangeLog.8 2011-11-16 17:47:25 +0000 @@ -434,7 +434,7 @@ for Emacs 20.4 and the earlier versions. (ps-mule-init-external-library): Just require a feature for external libraries. - (ps-mule-prologue): Postscript code modified for new composition. + (ps-mule-prologue): PostScript code modified for new composition. (ps-mule-find-wrappoint): New arg COMPOSITION. (ps-mule-plot-string): Delete code for composite characters. (ps-mule-plot-composition): New function. @@ -447,7 +447,7 @@ (ps-mule-plot-rule-cmpchar, ps-mule-plot-cmpchar, ps-mule-prepare-cmpchar-font): Deleted. (ps-mule-string-encoding): New arg NO-SETFONT. - (ps-mule-bitmap-prologue): In Postscript code of BuildGlyphCommon, + (ps-mule-bitmap-prologue): In PostScript code of BuildGlyphCommon, check Composing, not Cmpchar. (ps-mule-initialize): Set ps-mule-composition-prologue-generated to nil. === modified file 'lisp/ChangeLog.9' --- lisp/ChangeLog.9 2011-11-15 17:37:37 +0000 +++ lisp/ChangeLog.9 2011-11-16 17:47:25 +0000 @@ -1754,7 +1754,7 @@ number, column number and buffer-percent part of the mode-line. * image.el (image-type-regexps): Allow whitespace at the start - of the image data for XPM, XBM and Postscript, which are + of the image data for XPM, XBM and PostScript, which are text files. (image-jpeg-p): Correct calculation of next field offset. @@ -5955,7 +5955,7 @@ 2001-01-29 Gerd Moellmann * menu-bar.el (menu-bar-files-menu): Add menu items for - Postscript printing in black and white. + PostScript printing in black and white. * mail/rmail.el (rmail-ignored-headers): Add X-Sign, X-BeenThere, X-Mailman-Version, Precedence, List-Help, List-Post, === modified file 'lisp/calendar/icalendar.el' --- lisp/calendar/icalendar.el 2011-11-14 20:23:26 +0000 +++ lisp/calendar/icalendar.el 2011-11-16 17:47:25 +0000 @@ -112,7 +112,7 @@ ;; Customizables ;; ====================================================================== (defgroup icalendar nil - "Icalendar support." + "iCalendar support." :prefix "icalendar-" :group 'calendar) @@ -474,9 +474,9 @@ (week (if (eq day -1) byday (substring byday 0 -2)))) - ;; "Translate" the icalendar way to specify the last + ;; "Translate" the iCalendar way to specify the last ;; (sun|mon|...)day in month to the tzset way. - (if (string= week "-1") ; last day as icalendar calls it + (if (string= week "-1") ; last day as iCalendar calls it (setq week "5")) ; last day as tzset calls it (concat "M" bymonth "." week "." (if (eq day -1) "0" (int-to-string day)) @@ -907,7 +907,7 @@ "\\\\," "," string))))) ;; ====================================================================== -;; Export -- convert emacs-diary to icalendar +;; Export -- convert emacs-diary to iCalendar ;; ====================================================================== ;;;###autoload @@ -1063,7 +1063,7 @@ found-error)) (defun icalendar--convert-to-ical (nonmarker entry-main) - "Convert a diary entry to icalendar format. + "Convert a diary entry to iCalendar format. NONMARKER is a regular expression matching the start of non-marking entries. ENTRY-MAIN is the first line of the diary entry." (or @@ -1194,7 +1194,7 @@ ;; subroutines for icalendar-export-region (defun icalendar--convert-ordinary-to-ical (nonmarker entry-main) - "Convert \"ordinary\" diary entry to icalendar format. + "Convert \"ordinary\" diary entry to iCalendar format. NONMARKER is a regular expression matching the start of non-marking entries. ENTRY-MAIN is the first line of the diary entry." (if (string-match @@ -1291,7 +1291,7 @@ result)) (defun icalendar--convert-weekly-to-ical (nonmarker entry-main) - "Convert weekly diary entry to icalendar format. + "Convert weekly diary entry to iCalendar format. NONMARKER is a regular expression matching the start of non-marking entries. ENTRY-MAIN is the first line of the diary entry." (if (and (string-match (concat nonmarker @@ -1373,7 +1373,7 @@ nil)) (defun icalendar--convert-yearly-to-ical (nonmarker entry-main) - "Convert yearly diary entry to icalendar format. + "Convert yearly diary entry to iCalendar format. NONMARKER is a regular expression matching the start of non-marking entries. ENTRY-MAIN is the first line of the diary entry." (if (string-match (concat nonmarker @@ -1453,7 +1453,7 @@ nil)) (defun icalendar--convert-sexp-to-ical (nonmarker entry-main) - "Convert complex sexp diary entry to icalendar format -- unsupported! + "Convert complex sexp diary entry to iCalendar format -- unsupported! FIXME! @@ -1480,7 +1480,7 @@ nil))) (defun icalendar--convert-block-to-ical (nonmarker entry-main) - "Convert block diary entry to icalendar format. + "Convert block diary entry to iCalendar format. NONMARKER is a regular expression matching the start of non-marking entries. ENTRY-MAIN is the first line of the diary entry." (if (string-match (concat nonmarker @@ -1556,7 +1556,7 @@ nil)) (defun icalendar--convert-float-to-ical (nonmarker entry-main) - "Convert float diary entry to icalendar format -- partially unsupported! + "Convert float diary entry to iCalendar format -- partially unsupported! FIXME! DAY from diary-float yet unimplemented. @@ -1619,7 +1619,7 @@ nil)) (defun icalendar--convert-date-to-ical (nonmarker entry-main) - "Convert `diary-date' diary entry to icalendar format -- unsupported! + "Convert `diary-date' diary entry to iCalendar format -- unsupported! FIXME! @@ -1635,7 +1635,7 @@ nil)) (defun icalendar--convert-cyclic-to-ical (nonmarker entry-main) - "Convert `diary-cyclic' diary entry to icalendar format. + "Convert `diary-cyclic' diary entry to iCalendar format. NONMARKER is a regular expression matching the start of non-marking entries. ENTRY-MAIN is the first line of the diary entry." (if (string-match (concat nonmarker @@ -1709,7 +1709,7 @@ nil)) (defun icalendar--convert-anniversary-to-ical (nonmarker entry-main) - "Convert `diary-anniversary' diary entry to icalendar format. + "Convert `diary-anniversary' diary entry to iCalendar format. NONMARKER is a regular expression matching the start of non-marking entries. ENTRY-MAIN is the first line of the diary entry." (if (string-match (concat nonmarker @@ -1783,7 +1783,7 @@ nil)) ;; ====================================================================== -;; Import -- convert icalendar to emacs-diary +;; Import -- convert iCalendar to emacs-diary ;; ====================================================================== ;;;###autoload @@ -1825,19 +1825,19 @@ (interactive) (save-current-buffer ;; prepare ical - (message "Preparing icalendar...") + (message "Preparing iCalendar...") (set-buffer (icalendar--get-unfolded-buffer (current-buffer))) (goto-char (point-min)) - (message "Preparing icalendar...done") + (message "Preparing iCalendar...done") (if (re-search-forward "^BEGIN:VCALENDAR\\s-*$" nil t) (let (ical-contents ical-errors) ;; read ical - (message "Reading icalendar...") + (message "Reading iCalendar...") (beginning-of-line) (setq ical-contents (icalendar--read-element nil nil)) - (message "Reading icalendar...done") + (message "Reading iCalendar...done") ;; convert ical - (message "Converting icalendar...") + (message "Converting iCalendar...") (setq ical-errors (icalendar--convert-ical-to-diary ical-contents diary-file do-not-ask non-marking)) @@ -1848,11 +1848,11 @@ (save-current-buffer (set-buffer b) (save-buffer))))) - (message "Converting icalendar...done") + (message "Converting iCalendar...done") ;; return t if no error occurred (not ical-errors)) (message - "Current buffer does not contain icalendar contents!") + "Current buffer does not contain iCalendar contents!") ;; return nil, i.e. import did not work nil))) @@ -2056,12 +2056,12 @@ (set-buffer (get-buffer-create "*icalendar-errors*")) (erase-buffer) (insert error-string))) - (message "Converting icalendar...done") + (message "Converting iCalendar...done") found-error)) ;; subroutines for importing (defun icalendar--convert-recurring-to-diary (e dtstart-dec start-t end-t) - "Convert recurring icalendar event E to diary format. + "Convert recurring iCalendar event E to diary format. DTSTART-DEC is the DTSTART property of E. START-T is the event's start time in diary format. @@ -2274,7 +2274,7 @@ result)) (defun icalendar--convert-non-recurring-all-day-to-diary (event start-d end-d) - "Convert non-recurring icalendar EVENT to diary format. + "Convert non-recurring iCalendar EVENT to diary format. DTSTART is the decoded DTSTART property of E. Argument START-D gives the first day. @@ -2339,7 +2339,7 @@ ;; Examples ;; ====================================================================== (defun icalendar-import-format-sample (event) - "Example function for formatting an icalendar EVENT." + "Example function for formatting an iCalendar EVENT." (format (concat "SUMMARY=`%s' DESCRIPTION=`%s' LOCATION=`%s' ORGANIZER=`%s' " "STATUS=`%s' URL=`%s' CLASS=`%s'") (or (icalendar--get-event-property event 'SUMMARY) "") === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-11-16 12:34:47 +0000 +++ lisp/gnus/ChangeLog 2011-11-16 17:47:25 +0000 @@ -1,5 +1,9 @@ 2011-11-16 Juanma Barranquero + * gnus-sum.el (gnus-summary-make-menu-bar): + * gnus-uu.el (gnus-uu-decode-postscript) + (gnus-uu-decode-postscript-and-save): + * mailcap.el (mailcap-print-command): * registry.el (registry-lookup, registry-lookup-breaks-before-lexbind): Fix typos. @@ -20058,7 +20062,7 @@ * mail-source.el (mail-source-delete-crash-box): Refactor. (mail-source-fetch): Use it. (mail-source-fetch-file): Ditto. - (mail-source-fetch-directory): Run postscript in loop. + (mail-source-fetch-directory): Run PostScript in loop. (mail-source-fetch-pop): Delete. (mail-source-fetch-maildir): Ditto. (mail-source-fetch-imap): Ditto. === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2011-11-13 07:48:23 +0000 +++ lisp/gnus/gnus-sum.el 2011-11-16 17:47:25 +0000 @@ -2529,7 +2529,7 @@ ["Unshar and save" gnus-uu-decode-unshar-and-save t] ["Save" gnus-uu-decode-save t] ["Binhex" gnus-uu-decode-binhex t] - ["Postscript" gnus-uu-decode-postscript t] + ["PostScript" gnus-uu-decode-postscript t] ["All MIME parts" gnus-summary-save-parts t]) ("Cache" ["Enter article" gnus-cache-enter-article t] === modified file 'lisp/gnus/gnus-uu.el' --- lisp/gnus/gnus-uu.el 2011-11-14 20:23:26 +0000 +++ lisp/gnus/gnus-uu.el 2011-11-16 17:47:25 +0000 @@ -727,7 +727,7 @@ ;; All PostScript functions written by Erik Selberg . (defun gnus-uu-decode-postscript (&optional n) - "Gets postscript of the current article." + "Gets PostScript of the current article." (interactive "P") (gnus-uu-decode-with-method 'gnus-uu-decode-postscript-article n)) @@ -738,7 +738,7 @@ (gnus-uu-decode-postscript n))) (defun gnus-uu-decode-postscript-and-save (n dir) - "Extracts postscript and saves the current article." + "Extracts PostScript and saves the current article." (interactive (list current-prefix-arg (file-name-as-directory === modified file 'lisp/gnus/mailcap.el' --- lisp/gnus/mailcap.el 2011-08-26 09:01:56 +0000 +++ lisp/gnus/mailcap.el 2011-11-16 17:47:25 +0000 @@ -82,7 +82,7 @@ (list lpr-switches) lpr-switches))) " ") - "Shell command (including switches) used to print Postscript files.") + "Shell command (including switches) used to print PostScript files.") ;; Postpone using defcustom for this as it's so big and we essentially ;; have to have two copies of the data around then. Perhaps just === modified file 'lisp/menu-bar.el' --- lisp/menu-bar.el 2011-10-30 01:56:03 +0000 +++ lisp/menu-bar.el 2011-11-16 17:47:25 +0000 @@ -116,21 +116,21 @@ menu-bar-separator) (define-key menu [ps-print-region] - `(menu-item ,(purecopy "Postscript Print Region (B+W)") ps-print-region + `(menu-item ,(purecopy "PostScript Print Region (B+W)") ps-print-region :enable mark-active :help ,(purecopy "Pretty-print marked region in black and white to PostScript printer"))) (define-key menu [ps-print-buffer] - `(menu-item ,(purecopy "Postscript Print Buffer (B+W)") ps-print-buffer + `(menu-item ,(purecopy "PostScript Print Buffer (B+W)") ps-print-buffer :enable (menu-bar-menu-frame-live-and-visible-p) :help ,(purecopy "Pretty-print current buffer in black and white to PostScript printer"))) (define-key menu [ps-print-region-faces] - `(menu-item ,(purecopy "Postscript Print Region") + `(menu-item ,(purecopy "PostScript Print Region") ps-print-region-with-faces :enable mark-active :help ,(purecopy "Pretty-print marked region to PostScript printer"))) (define-key menu [ps-print-buffer-faces] - `(menu-item ,(purecopy "Postscript Print Buffer") + `(menu-item ,(purecopy "PostScript Print Buffer") ps-print-buffer-with-faces :enable (menu-bar-menu-frame-live-and-visible-p) :help ,(purecopy "Pretty-print current buffer to PostScript printer"))) === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2011-11-16 12:34:47 +0000 +++ lisp/org/ChangeLog 2011-11-16 17:47:25 +0000 @@ -1,7 +1,13 @@ 2011-11-16 Juanma Barranquero - * org-agenda.el (org-create-marker-find-array): + * org-agenda.el (org-agenda-add-entry-text-descriptive-links) + (org-agenda-custom-commands, org-write-agenda, org-check-for-org-mode) + (org-search-syntax-table, org-modify-diary-entry-string) + (org-write-agenda): + * org-bbdb.el (org-bbdb-anniv-export-ical): * org-bibtex.el (org-bibtex-fields): + * org-icalendar.el (org-icalendar-date-time-format): + * org-latex.el (org-export-latex-inline-image-extensions): * org-list.el (org-list-insert-item): Fix typos. 2011-11-11 Juanma Barranquero @@ -61,7 +67,7 @@ 2011-07-28 Bastien Guerry - * org-publish.el (org-publish-index-generate-theindex): rename + * org-publish.el (org-publish-index-generate-theindex): Rename from `org-publish-index-generate-theindex.inc'. Use the file theindex.org directly instead of including theindex.inc. (org-publish-projects): Don't delete .orgx files. @@ -141,7 +147,7 @@ 2011-07-28 Nicolas Goaziou - * org.el (org-timestamp-change): keep point in the same category + * org.el (org-timestamp-change): Keep point in the same category when updating a time-stamp. This requires to be careful, as, depending on the locale, name of day might change of length during the process. @@ -592,7 +598,7 @@ 2011-07-28 Nicolas Goaziou - * org.el (org-in-block-p): new function. + * org.el (org-in-block-p): New function. * org-footnote.el (org-footnote-forbidden-blocks): New variable. (org-footnote-in-valid-context-p): New function. @@ -886,131 +892,131 @@ 2011-07-28 Nicolas Goaziou - * org-footnote.el (org-footnote-action): offer to create + * org-footnote.el (org-footnote-action): Offer to create definition when none is found. 2011-07-28 Nicolas Goaziou - * org-footnote.el (org-footnote-re): avoid matching inactive + * org-footnote.el (org-footnote-re): Avoid matching inactive time-stamps or check-box cookies. - (org-footnote-next-reference-or-definition): adapt to the new regexp. + (org-footnote-next-reference-or-definition): Adapt to the new regexp. 2011-07-28 Nicolas Goaziou - * org-exp.el (org-export-preprocess-string): if the last subtree + * org-exp.el (org-export-preprocess-string): If the last subtree is commented, footnotes inserted during normalizing at the end of the buffer may get deleted. This patch ensures deletion comes first, normalization second. 2011-07-28 Nicolas Goaziou - * org-exp.el (org-export-footnotes-data): change docstring. - (org-export-footnotes-seen): renamed from + * org-exp.el (org-export-footnotes-data): Change docstring. + (org-export-footnotes-seen): Rename from org-export-footnotes-markers. - * org-ascii.el (org-export-as-ascii): apply change. - - * org-docbook.el (org-export-as-docbook): apply change. - - * org-footnote.el (org-footnote-normalize): apply change. - - * org-html.el (org-export-as-html): apply change. - - * org-latex.el (org-export-as-latex): apply change. + * org-ascii.el (org-export-as-ascii): Apply change. + + * org-docbook.el (org-export-as-docbook): Apply change. + + * org-footnote.el (org-footnote-normalize): Apply change. + + * org-html.el (org-export-as-html): Apply change. + + * org-latex.el (org-export-as-latex): Apply change. 2011-07-28 Nicolas Goaziou - * org-latex.el (org-export-latex-preprocess): rely on + * org-latex.el (org-export-latex-preprocess): Rely on `org-export-footnotes-markers' to retreive definition of the current footnote during export. 2011-07-28 Nicolas Goaziou - * org-footnote.el (org-footnote-normalize): remember footnotes + * org-footnote.el (org-footnote-normalize): Remember footnotes seen so far by the exporter when choosing the new marker. 2011-07-28 Nicolas Goaziou - * org-footnote.el (org-footnote-normalize): make use of + * org-footnote.el (org-footnote-normalize): Make use of `org-footnote-insert-pos-for-preprocessor'. 2011-07-28 Nicolas Goaziou - * org-footnote.el (org-footnote-normalize): add `org-footnote' + * org-footnote.el (org-footnote-normalize): Add `org-footnote' property to footnote markers when preparing for exportation. - * org-html.el (org-export-as-html): read new property to decide + * org-html.el (org-export-as-html): Read new property to decide when to export a footnote. - * org-docbook.el (org-export-as-docbook): read new property to + * org-docbook.el (org-export-as-docbook): Read new property to decide when to export a footnote. - * org-latex.el (org-export-latex-preprocess): ensure footnote at + * org-latex.el (org-export-latex-preprocess): Ensure footnote at column 0 cannot end a list containing it by adding `original-indentation' property to it. 2011-07-28 Nicolas Goaziou - * org-exp.el (org-export-preprocess-string): normalize footnotes + * org-exp.el (org-export-preprocess-string): Normalize footnotes before marking lists ending. - * org-latex.el (org-export-latex-preprocess): work with labels as + * org-latex.el (org-export-latex-preprocess): Work with labels as strings and not as numbers. 2011-07-28 Nicolas Goaziou - * org-docbook.el (org-export-docbook-footnote-separator): new - variable - (org-export-as-docbook): add a separator between footnotes. - - * org-html.el (org-export-html-footnote-separator): new variable. - (org-export-as-html): add a separator between footnotes. - - * org-latex.el (org-export-latex-footnote-separator): new - variable. - (org-export-latex-preprocess): add a separator between footnotes. + * org-docbook.el (org-export-docbook-footnote-separator): New + variable. + (org-export-as-docbook): Add a separator between footnotes. + + * org-html.el (org-export-html-footnote-separator): New variable. + (org-export-as-html): Add a separator between footnotes. + + * org-latex.el (org-export-latex-footnote-separator): New + variable. + (org-export-latex-preprocess): Add a separator between footnotes. 2011-07-28 Nicolas Goaziou * org-exp.el (org-export-footnotes-markers) - (org-export-footnotes-data): new variables. - (org-export-preprocess-string): use a more explicit argument. + (org-export-footnotes-data): New variables. + (org-export-preprocess-string): Use a more explicit argument. 2011-07-28 Nicolas Goaziou - * org-footnote.el (org-footnote-goto-definition): now, determining + * org-footnote.el (org-footnote-goto-definition): Now, determining if point is at a footnote reference is entirely determined by `org-footnote-at-reference-p'. No need to check if pattern isn't at beginning of the line elsewhere. 2011-07-28 Nicolas Goaziou - * org-footnote.el (org-footnote-next-reference-or-definition): new + * org-footnote.el (org-footnote-next-reference-or-definition): New function. - * org.el (org-activate-footnote-links): activate the whole + * org.el (org-activate-footnote-links): Activate the whole footnote, but only fontify its label. 2011-07-28 Nicolas Goaziou - * org-footnote.el (org-footnote-normalize): make use of changes to + * org-footnote.el (org-footnote-normalize): Make use of changes to `org-footnote-at-reference-p' and creation of various functions.. Also comment code. - (org-footnote-get-next-reference, org-footnote-delete-references, - org-footnote-delete-definitions): new functions - (org-footnote-goto-previous-reference, org-footnote-all-labels, - org-insert-footnote-reference-near-definition, org-footnote-delete): - rewrite to use org-footnote-get-next-reference. + (org-footnote-get-next-reference, org-footnote-delete-references) + (org-footnote-delete-definitions): New functions. + (org-footnote-goto-previous-reference, org-footnote-all-labels) + (org-insert-footnote-reference-near-definition, org-footnote-delete): + Rewrite to use org-footnote-get-next-reference. 2011-07-28 Nicolas Goaziou - * org-footnote.el (org-footnote-re): don't end an inline footnote + * org-footnote.el (org-footnote-re): Don't end an inline footnote at unrelated closing square brackets. - (org-footnote-at-reference-p): improve accuracy of the function to + (org-footnote-at-reference-p): Improve accuracy of the function to determine if point is at a reference and to extract definition of an inline footnote. - (org-footnote-all-labels, org-footnote-action, org-footnote-delete, - org-footnote-auto-adjust-maybe): make use of previous function. + (org-footnote-all-labels, org-footnote-action, org-footnote-delete) + (org-footnote-auto-adjust-maybe): Make use of previous function. 2011-07-28 Bastien Guerry @@ -1064,14 +1070,14 @@ 2011-07-28 Nicolas Goaziou - * org-list.el (org-cycle-item-indentation): cycling back to + * org-list.el (org-cycle-item-indentation): Cycling back to original position deleted any additional information in the item, like a counter or a tag. 2011-07-28 Pieter Praet * org-crypt.el (org-crypt-disable-auto-save): New defcustom. - (org-decrypt-entry): before decrypting, check whether + (org-decrypt-entry): Before decrypting, check whether `auto-save-mode' is enabled for the current buffer, and act on it according to how `org-crypt-disable-auto-save' is set. Remove comment re "encrypt[ing] Org auto-saved buffers". Remove on-init @@ -1255,29 +1261,29 @@ 2011-07-28 Eric Schulte - * ob-C.el (ob-tangle): initialize variable from `ob-tangle'. - - * ob-asymptote.el (ob-tangle): initialize variable from `ob-tangle'. - - * ob-awk.el (ob-tangle): initialize variable from `ob-tangle'. - - * ob-clojure.el (ob-tangle): initialize variable from `ob-tangle'. - - * ob-haskell.el (ob-tangle): initialize variable from `ob-tangle'. - - * ob-latex.el (ob-tangle): initialize variable from `ob-tangle'. - - * ob-lisp.el (ob-tangle): initialize variable from `ob-tangle'. - - * ob-ocaml.el (ob-tangle): initialize variable from `ob-tangle'. - - * ob-perl.el (ob-tangle): initialize variable from `ob-tangle'. - - * ob-python.el (ob-tangle): initialize variable from `ob-tangle'. - - * ob-ruby.el (ob-tangle): initialize variable from `ob-tangle'. - - * ob-tangle.el (ob-tangle): initialize variable from `ob-tangle'. + * ob-C.el (ob-tangle): Initialize variable from `ob-tangle'. + + * ob-asymptote.el (ob-tangle): Initialize variable from `ob-tangle'. + + * ob-awk.el (ob-tangle): Initialize variable from `ob-tangle'. + + * ob-clojure.el (ob-tangle): Initialize variable from `ob-tangle'. + + * ob-haskell.el (ob-tangle): Initialize variable from `ob-tangle'. + + * ob-latex.el (ob-tangle): Initialize variable from `ob-tangle'. + + * ob-lisp.el (ob-tangle): Initialize variable from `ob-tangle'. + + * ob-ocaml.el (ob-tangle): Initialize variable from `ob-tangle'. + + * ob-perl.el (ob-tangle): Initialize variable from `ob-tangle'. + + * ob-python.el (ob-tangle): Initialize variable from `ob-tangle'. + + * ob-ruby.el (ob-tangle): Initialize variable from `ob-tangle'. + + * ob-tangle.el (ob-tangle): Initialize variable from `ob-tangle'. 2011-07-28 Eric Schulte @@ -1300,12 +1306,12 @@ 2011-07-28 Nicolas Goaziou - * org-list.el (org-reset-checkbox-state-subtree): make the command + * org-list.el (org-reset-checkbox-state-subtree): Make the command more robust, and correctly update check-boxes in the whole sub-tree. - (org-update-checkbox-count): fix bug accumulating count of checkboxes + (org-update-checkbox-count): Fix bug accumulating count of checkboxes when walking a subtree. - (org-update-checkbox-count-maybe): add an optional argument passed to + (org-update-checkbox-count-maybe): Add an optional argument passed to org-update-checkbox-count. 2011-07-28 Ted Zlatanov @@ -1331,9 +1337,9 @@ 2011-07-28 Nicolas Goaziou - * org-list.el (org-list-parse-list): replace transitional + * org-list.el (org-list-parse-list): Replace transitional check-boxes with "[CBTRANS]" string during parsing. - (org-list-to-generic): use the new property `:cbtrans' to configure + (org-list-to-generic): Use the new property `:cbtrans' to configure export string for transitional check-boxes. 2011-07-28 Carsten Dominik @@ -2799,7 +2805,7 @@ 2011-07-28 Bastien Guerry - * org-html.el (org-export-as-html): fix export of email. + * org-html.el (org-export-as-html): Fix export of email. 2011-07-28 Eric Schulte @@ -2820,11 +2826,11 @@ 2011-07-28 Bastien Guerry - * org-crypt.el: remove useless TODO in comments. + * org-crypt.el: Remove useless TODO in comments. 2011-07-28 Bastien Guerry - * org-html.el (org-export-as-html): the default postamble now only + * org-html.el (org-export-as-html): The default postamble now only export a date paragraph if `org-export-time-stamp-file' is non-nil. @@ -2930,9 +2936,9 @@ 2011-07-28 Manuel Giraud - * org-html.el (org-format-org-table-html): fix anchors in HTML + * org-html.el (org-format-org-table-html): Fix anchors in HTML export (thanks to ) - (org-html-protect): fix a bug that prevents some target to be + (org-html-protect): Fix a bug that prevents some target to be rendered correctly. 2011-07-28 Bastien Guerry @@ -3017,15 +3023,15 @@ 2011-07-28 Bastien Guerry - * org-capture.el (org-capture-put-target-region-and-position): New - function to store information about the target buffer. + * org-capture.el (org-capture-put-target-region-and-position): + New function to store information about the target buffer. (org-capture-set-target-location): Use it. - (org-capture-finalize): restore the target buffer in its + (org-capture-finalize): Restore the target buffer in its possibly narrowed state. Also restore the cursor position. 2011-07-28 Bastien Guerry - * org-crypt.el (auto-save-default): make sure entries are + * org-crypt.el (auto-save-default): Make sure entries are encrypted before auto-saving. 2011-07-28 Nicolas Goaziou @@ -3041,7 +3047,7 @@ 2011-07-28 Nicolas Goaziou - * org.el (org-narrow-to-subtree): ensure `org-back-to-heading' + * org.el (org-narrow-to-subtree): Ensure `org-back-to-heading' will move point to a real heading and not an inline task by wraping function into a `org-with-limited-levels' macro. @@ -3065,7 +3071,7 @@ 2011-07-28 Bastien Guerry - * org-table.el (org-table-fix-formulas-confirm): new custom + * org-table.el (org-table-fix-formulas-confirm): New custom variable. (org-table-insert-column, org-table-delete-column) (org-table-move-column, org-table-move-row) @@ -3095,14 +3101,14 @@ 2011-07-28 Lawrence Mitchell - * org-latex.el: place \title \author \date before + * org-latex.el: Place \title \author \date before \begin{document}. 2011-07-28 Bastien Guerry * org-html.el (org-export-html-preamble) - (org-export-html-postamble): now default to `nil'. - (org-export-as-html): when :html-pre/postamble is nil, fall + (org-export-html-postamble): Now default to `nil'. + (org-export-as-html): When :html-pre/postamble is nil, fall back on the default pre/postamble, which depends on the :author-info, :email-info, :creator-info options. @@ -3123,7 +3129,7 @@ 2011-07-28 Bastien Guerry - * org.el (org-move-subtree-down): leave the cursor at the same + * org.el (org-move-subtree-down): Leave the cursor at the same column we were at. 2011-07-28 Bastien Guerry @@ -3136,7 +3142,7 @@ 2011-07-28 Bastien Guerry - * org-exp.el (org-export-remove-headline-metadata): bugfix: don't + * org-exp.el (org-export-remove-headline-metadata): Bugfix: don't case-fold-search to avoid mixing TODO keywords with real headline words. @@ -3162,7 +3168,7 @@ 2011-07-28 Bastien Guerry * org-html.el (org-export-html-postamble-format) - (org-export-html-preamble-format): explain how to escape the + (org-export-html-preamble-format): Explain how to escape the `%' character. 2011-07-28 Bastien Guerry @@ -3339,14 +3345,14 @@ 2011-07-28 Eric Schulte * ob-latex.el (org-babel-execute:latex): Add imagemagick options, - and for file types other than png and pdf it uses imagemagick to - convert a compiled pdf file to the desired file type. - (convert-pdf): Convert a pdf file to a new file type using + and for file types other than png and PDF it uses imagemagick to + convert a compiled PDF file to the desired file type. + (convert-pdf): Convert a PDF file to a new file type using imagemagick. 2011-07-28 Puneeth Chaganti - * org-capture.el (org-capture-fill-template): fix bug with the + * org-capture.el (org-capture-fill-template): Fix bug with the display of interactive prompt in templates expansion. 2011-07-28 Reiner Steib @@ -3603,7 +3609,7 @@ 2011-07-28 Nicolas Goaziou - * org-list.el (org-list-struct): when a line has org-example + * org-list.el (org-list-struct): When a line has org-example property, skip the entire block. This is needed during export, for example when src blocks in org markup contain lists, and are returned verbatim because org isn't in the list of interpreted @@ -3712,7 +3718,7 @@ * org-capture.el (org-capture-place-item): Reflect changes to `org-item-beginning-re'. - * org-docbook.el (org-export-docbook-list-line): handle New type + * org-docbook.el (org-export-docbook-list-line): Handle New type of items. * org-exp.el (org-export-mark-list-end) @@ -4171,7 +4177,7 @@ 2011-07-28 Bastien Guerry - * org-html.el (org-export-as-html): expand the HTML title. + * org-html.el (org-export-as-html): Expand the HTML title. 2011-07-28 Bastien Guerry @@ -4951,7 +4957,7 @@ 2011-07-28 Nicolas Goaziou - * org-exp.el (org-export-mark-list-ending): insert additional + * org-exp.el (org-export-mark-list-ending): Insert additional newline characters if end-list-marker is at a wrong position. 2011-07-28 Eric Schulte @@ -5792,7 +5798,7 @@ 2010-12-11 Nicolas Goaziou - * org-exp.el (org-export-preprocess-string): delaying code block + * org-exp.el (org-export-preprocess-string): Delay code block processing a bit to allow correct list parsing in the export string. 2010-12-11 Christopher Allan Webber @@ -5849,7 +5855,7 @@ 2010-12-11 Eric Schulte - * ob-lob.el (org-babel-lob-get-info): including pass-through + * ob-lob.el (org-babel-lob-get-info): Include pass-through header arguments in results variable header argument string. 2010-12-11 David Maus @@ -5873,7 +5879,7 @@ 2010-12-11 Nicolas Goaziou - * org.el (org-indent-line-function): simplify code and remove bug that + * org.el (org-indent-line-function): Simplify code and remove bug that would insert a tab at the beginning of the line when trying to indent the item. @@ -5897,7 +5903,7 @@ 2010-12-11 Eric Schulte - * ob-calc.el (org-babel-execute:calc): support for variables -- + * ob-calc.el (org-babel-execute:calc): Support for variables -- converts :var variables in calc variables. 2010-12-11 Carsten Dominik @@ -7475,7 +7481,7 @@ 2010-11-11 Eric Schulte - * ob-tangle.el: autoload org-babel-tangle-lang-exts from ob-tangle. + * ob-tangle.el: Autoload org-babel-tangle-lang-exts from ob-tangle. 2010-11-11 Dan Davison @@ -8437,7 +8443,7 @@ 2010-11-11 Eric Schulte - * ob-scheme.el: very preliminary support for evaluating scheme + * ob-scheme.el: Very preliminary support for evaluating scheme code blocks. * org.el (org-babel-load-languages): Adding scheme. @@ -8547,7 +8553,7 @@ * ob-latex.el (org-babel-execute:latex): Adding new ":fit" and ":border" header arguments which both use the "preview" latex - package to fit the resulting pdf image to the figure. + package to fit the resulting PDF image to the figure. 2010-11-11 David Maus @@ -8606,8 +8612,8 @@ 2010-11-11 David Maus - * org-agenda.el (org-write-agenda): Delete postscript file after - creating conversion to pdf. + * org-agenda.el (org-write-agenda): Delete PostScript file after + creating conversion to PDF. 2010-11-11 David Maus @@ -17058,7 +17064,7 @@ * org.el (org-entry-get-multivalued-property) (org-entry-protect-space, org-entry-restore-space): New functions. - (org-file-apps-defaults-macosx): Let postscript files be opened by + (org-file-apps-defaults-macosx): Let PostScript files be opened by preview. (org-time-stamp-inactive): Call `org-time-stamp'. (org-time-stamp): New argument `inactive'. Also edit inacive === modified file 'lisp/org/org-agenda.el' --- lisp/org/org-agenda.el 2011-11-16 12:34:47 +0000 +++ lisp/org/org-agenda.el 2011-11-16 17:47:25 +0000 @@ -156,7 +156,7 @@ "Non-nil means export org-links as descriptive links in agenda added text. This variable applies to the text added to the agenda when `org-agenda-add-entry-text-maxlines' is larger than 0. -When this variable nil, the URL will (also) be shown." +When this variable is nil, the URL will (also) be shown." :group 'org-agenda :type 'boolean) @@ -339,7 +339,7 @@ key The key (one or more characters as a string) to be associated with the command. -desc A description of the command, when omitted or nil, a default +desc A description of the command; when omitted or nil, a default description is built using MATCH. type The command type, any of the following symbols: agenda The daily/weekly agenda. @@ -354,7 +354,7 @@ match What to search for: - a single keyword for TODO keyword searches - a tags match expression for tags searches - - a word search expression for text searches. + - a word search expression for text searches - a regular expression for occur searches For all other commands, this should be the empty string. settings A list of option settings, similar to that in a let form, so like @@ -363,7 +363,7 @@ files A list of files file to write the produced agenda buffer to with the command `org-store-agenda-views'. If a file name ends in \".html\", an HTML version of the buffer - is written out. If it ends in \".ps\", a postscript version is + is written out. If it ends in \".ps\", a PostScript version is produced. Otherwise, only the plain text is written to the file. You can also define a set of commands, to create a composite agenda buffer. @@ -2744,8 +2744,8 @@ (defun org-write-agenda (file &optional open nosettings) "Write the current buffer (an agenda view) as a file. Depending on the extension of the file name, plain text (.txt), -HTML (.html or .htm) or Postscript (.ps) is produced. -If the extension is .ics, run icalendar export over all files used +HTML (.html or .htm) or PostScript (.ps) is produced. +If the extension is .ics, run iCalendar export over all files used to construct the agenda and limit the export to entries listed in the agenda now. With prefix argument OPEN, open the new file immediately. @@ -2793,7 +2793,7 @@ ((string-match "\\.ps\\'" file) (require 'ps-print) (ps-print-buffer-with-faces file) - (message "Postscript written to %s" file)) + (message "PostScript written to %s" file)) ((string-match "\\.pdf\\'" file) (require 'ps-print) (ps-print-buffer-with-faces @@ -2997,7 +2997,7 @@ (member (point) (cdr a))))))) (defun org-check-for-org-mode () - "Make sure current buffer is in org-mode. Error if not." + "Make sure current buffer is in Org-mode. Error if not." (or (org-mode-p) (error "Cannot execute org-mode agenda command on buffer in %s" major-mode))) @@ -3715,9 +3715,9 @@ (defvar org-todo-only nil) (defvar org-search-syntax-table nil - "Special syntax table for org-mode search. -In this table, we have single quotes not as word constituents, to -that when \"+Ameli\" is searched as a work, it will also match \"Ameli's\"") + "Special syntax table for Org-mode search. +In this table, we have single quotes not as word constituents, so +that when \"+Ameli\" is searched as a word, it will also match \"Ameli's\"") (defun org-search-syntax-table () (unless org-search-syntax-table @@ -4425,7 +4425,7 @@ (setq string (org-modify-diary-entry-string string)))))) (defun org-modify-diary-entry-string (string) - "Add text properties to string, allowing org-mode to act on it." + "Add text properties to string, allowing Org-mode to act on it." (org-add-props string nil 'mouse-face 'highlight 'help-echo (if buffer-file-name === modified file 'lisp/org/org-bbdb.el' --- lisp/org/org-bbdb.el 2011-08-18 20:41:06 +0000 +++ lisp/org/org-bbdb.el 2011-11-16 17:47:25 +0000 @@ -357,7 +357,7 @@ (bbdb-record-name (car (bbdb-completing-read-record "Name: "))))) (defun org-bbdb-anniv-export-ical () - "Extract anniversaries from BBDB and convert them to icalendar format." + "Extract anniversaries from BBDB and convert them to iCalendar format." (require 'bbdb) (require 'diary-lib) (unless (hash-table-p org-bbdb-anniv-hash) === modified file 'lisp/org/org-icalendar.el' --- lisp/org/org-icalendar.el 2011-08-18 20:41:06 +0000 +++ lisp/org/org-icalendar.el 2011-11-16 17:47:25 +0000 @@ -204,7 +204,7 @@ (if org-icalendar-use-UTC-date-time ":%Y%m%dT%H%M%SZ" ":%Y%m%dT%H%M%S") - "Format-string for exporting icalendar DATE-TIME. + "Format-string for exporting iCalendar DATE-TIME. See `format-time-string' for a full documentation. The only difference is that `org-icalendar-timezone' is used for %Z. === modified file 'lisp/org/org-latex.el' --- lisp/org/org-latex.el 2011-08-18 20:41:06 +0000 +++ lisp/org/org-latex.el 2011-11-16 17:47:25 +0000 @@ -304,8 +304,8 @@ (defcustom org-export-latex-href-format "\\href{%s}{%s}" "A printf format string to be applied to href links. -The format must contain either two %s instances or just one. -If it contains two %s instances, the first will be filled with +The format must contain either two %s instances or just one. +If it contains two %s instances, the first will be filled with the link, the second with the link description. If it contains only one, the %s will be filled with the link." :group 'org-export-latex @@ -594,7 +594,7 @@ "Extensions of image files that can be inlined into LaTeX. Note that the image extension *actually* allowed depend on the way the LaTeX file is processed. When used with pdflatex, pdf, jpg and png images -are OK. When processing through dvi to Postscript, only ps and eps are +are OK. When processing through dvi to PostScript, only ps and eps are allowed. The default we use here encompasses both." :group 'org-export-latex :type '(repeat (string :tag "Extension"))) @@ -2203,7 +2203,7 @@ ;; a LaTeX issue, but we here implement a work-around anyway. (setq path (org-export-latex-protect-amp path) desc (org-export-latex-protect-amp desc))) - (insert + (insert (if (string-match "%s.*%s" org-export-latex-href-format) (format org-export-latex-href-format path desc) (format org-export-latex-href-format path)))) === modified file 'lisp/printing.el' --- lisp/printing.el 2011-07-14 14:54:32 +0000 +++ lisp/printing.el 2011-11-16 17:47:25 +0000 @@ -4667,7 +4667,7 @@ "Interactively select a PostScript utility." (interactive) (pr-menu-set-utility-title - (pr-complete-alist "Postscript utility" + (pr-complete-alist "PostScript utility" pr-ps-utility-alist pr-ps-utility))) === modified file 'lisp/progmodes/gdb-mi.el' --- lisp/progmodes/gdb-mi.el 2011-11-15 17:37:37 +0000 +++ lisp/progmodes/gdb-mi.el 2011-11-16 17:47:25 +0000 @@ -25,7 +25,7 @@ ;;; Credits: -;; This file was written by by Nick Roberts following the general design +;; This file was written by Nick Roberts following the general design ;; used in gdb-ui.el for Emacs 22.1 - 23.1. It is currently being developed ;; by Dmitry Dzhus as part of the Google Summer ;; of Code 2009 Project "Emacs GDB/MI migration". === modified file 'lisp/progmodes/idlw-shell.el' --- lisp/progmodes/idlw-shell.el 2011-11-15 07:55:13 +0000 +++ lisp/progmodes/idlw-shell.el 2011-11-16 17:47:25 +0000 @@ -939,7 +939,7 @@ ------------------------------- Info documentation for this package is available. Use \\[idlwave-info] to display (complain to your sysadmin if that does not work). - For Postscript and HTML versions of the documentation, check IDLWAVE's + For PostScript and HTML versions of the documentation, check IDLWAVE's homepage at URL `http://idlwave.org'. IDLWAVE has customize support - see the group `idlwave'. === modified file 'lisp/progmodes/vhdl-mode.el' --- lisp/progmodes/vhdl-mode.el 2011-11-15 17:37:37 +0000 +++ lisp/progmodes/vhdl-mode.el 2011-11-16 17:47:25 +0000 @@ -58,7 +58,7 @@ ;; - Word/keyword completion ;; - Block commenting ;; - Code fixing/alignment/beautification -;; - Postscript printing +;; - PostScript printing ;; - VHDL'87/'93 and VHDL-AMS supported ;; - Comprehensive menu ;; - Fully customizable @@ -1752,7 +1752,7 @@ (defcustom vhdl-print-two-column t "*Non-nil means print code in two columns and landscape format. -Adjusts settings in a way that postscript printing (\"File\" menu, `ps-print') +Adjusts settings in a way that PostScript printing (\"File\" menu, `ps-print') prints VHDL files in a nice two-column landscape style. NOTE: Activate the new setting by restarting Emacs. @@ -1761,7 +1761,7 @@ :group 'vhdl-print) (defcustom vhdl-print-customize-faces t - "*Non-nil means use an optimized set of faces for postscript printing. + "*Non-nil means use an optimized set of faces for PostScript printing. NOTE: Activate the new setting by restarting Emacs. Overrides `ps-print' settings locally." @@ -4567,10 +4567,10 @@ PRINTING: - Postscript printing with different faces (an optimized set of faces is + PostScript printing with different faces (an optimized set of faces is used if `vhdl-print-customize-faces' is non-nil) or colors \(if `ps-print-color-p' is non-nil) is possible using the standard Emacs - postscript printing commands. Option `vhdl-print-two-column' defines + PostScript printing commands. Option `vhdl-print-two-column' defines appropriate default settings for nice landscape two-column printing. The paper format can be set by option `ps-paper-type'. Do not forget to switch `ps-print-color-p' to nil for printing on black-and-white @@ -12913,10 +12913,10 @@ (font-lock-mode t)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Initialization for postscript printing +;; Initialization for PostScript printing (defun vhdl-ps-print-settings () - "Initialize custom face and page settings for postscript printing." + "Initialize custom face and page settings for PostScript printing." ;; define custom face settings (unless (or (not vhdl-print-customize-faces) ps-print-color-p) @@ -12951,7 +12951,7 @@ (set (make-local-variable 'ps-right-margin) 40.0)))) (defun vhdl-ps-print-init () - "Initialize postscript printing." + "Initialize PostScript printing." (if (featurep 'xemacs) (when (boundp 'ps-print-color-p) (vhdl-ps-print-settings)) === modified file 'lisp/ps-samp.el' --- lisp/ps-samp.el 2011-02-03 07:21:56 +0000 +++ lisp/ps-samp.el 2011-11-16 17:47:25 +0000 @@ -237,7 +237,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; If zeroconf is enabled, all CUPS printers can be detected. The -;; "Postscript printer" menu will be modified dynamically, as printers +;; "PostScript printer" menu will be modified dynamically, as printers ;; are added or removed. ;; Preconditions: @@ -257,7 +257,7 @@ (require 'printing) (require 'zeroconf) -;; Add a Postscript printer to the "Postscript printer" menu. +;; Add a PostScript printer to the "PostScript printer" menu. (defun ps-add-printer (service) (let ((name (zeroconf-service-name service)) (text (zeroconf-service-txt service)) @@ -267,7 +267,7 @@ ;; `text' is an array of key=value strings like ("Duplex=T" "Copies=T"). (dolist (string text) (let ((split (split-string string "=" t))) - ;; If it is a Postscript printer, there must be a string like + ;; If it is a PostScript printer, there must be a string like ;; "pdl=application/postscript,application/vnd.hp-PCL,...". (when (and (string-equal "pdl" (car split)) (string-match "application/postscript" (cadr split))) @@ -288,7 +288,7 @@ "-H" (format "%s:%s" addr port)))) (pr-update-menus t)))) -;; Remove a printer from the "Postscript printer" menu. +;; Remove a printer from the "PostScript printer" menu. (defun ps-remove-printer (service) (setq pr-ps-printer-alist (delete (assoc (intern (zeroconf-service-name service)) === modified file 'lisp/textmodes/ispell.el' --- lisp/textmodes/ispell.el 2011-11-14 21:00:24 +0000 +++ lisp/textmodes/ispell.el 2011-11-16 17:47:25 +0000 @@ -3503,7 +3503,7 @@ '( ;; Don't spell check signatures "^-- $" - ;; Matches postscript files. + ;; Matches PostScript files. ;;"^%!PS-Adobe-[123].0" ;; Matches uuencoded text ;;"^begin [0-9][0-9][0-9] .*\nM.*\nM.*\nM" === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-16 12:34:47 +0000 +++ src/ChangeLog 2011-11-16 17:47:25 +0000 @@ -1,6 +1,7 @@ 2011-11-16 Juanma Barranquero - * window.c (syms_of_window) : Fix typo. + * nsfns.m (Fns_font_name): + * window.c (syms_of_window) : Fix typos. 2011-11-16 Martin Rudalics === modified file 'src/ChangeLog.11' --- src/ChangeLog.11 2011-11-14 21:00:24 +0000 +++ src/ChangeLog.11 2011-11-16 17:47:25 +0000 @@ -23551,7 +23551,7 @@ STORE_XCHARB a valid l-value. * w32term.c (w32_native_per_char_metric): Swap width and rbearing - calculations for non-Truetype fonts. + calculations for non-TrueType fonts. (x_draw_glyph_string): Sync with xterm.c. (x_draw_glyph_string_foreground) [USE_FONT_BACKEND]: Remove redundant code. === modified file 'src/nsfns.m' --- src/nsfns.m 2011-11-14 06:27:12 +0000 +++ src/nsfns.m 2011-11-16 17:47:25 +0000 @@ -1846,7 +1846,7 @@ DEFUN ("ns-font-name", Fns_font_name, Sns_font_name, 1, 1, 0, - doc: /* Determine font postscript or family name for font NAME. + doc: /* Determine font PostScript or family name for font NAME. NAME should be a string containing either the font name or an XLFD font descriptor. If string contains `fontset' and not `fontset-startup', it is left alone. */) === modified file 'src/nsterm.h' --- src/nsterm.h 2011-09-09 01:06:52 +0000 +++ src/nsterm.h 2011-11-16 17:47:25 +0000 @@ -447,7 +447,7 @@ { struct font font; - char *name; /* postscript name, uniquely identifies on NS systems */ + char *name; /* PostScript name, uniquely identifies on NS systems */ float width; /* this and following metrics stored as float rather than int */ float height; float underpos; === modified file 'src/w32font.c' --- src/w32font.c 2011-11-14 23:59:56 +0000 +++ src/w32font.c 2011-11-16 17:47:25 +0000 @@ -1284,8 +1284,8 @@ { /* Only truetype fonts will have information about what scripts they support. This probably means the user - will have to force Emacs to use raster, postscript - or atm fonts for non-ASCII text. */ + will have to force Emacs to use raster, PostScript + or ATM fonts for non-ASCII text. */ if (type & TRUETYPE_FONTTYPE) { Lisp_Object support @@ -1464,7 +1464,7 @@ /* Helvetica is mapped to Arial in Windows, but if a Type-1 Helvetica is installed, we run into problems with the Uniscribe backend which tries to avoid non-truetype fonts, and ends up mixing the Type-1 Helvetica - with Arial's characteristics, since that attempt to use Truetype works + with Arial's characteristics, since that attempt to use TrueType works some places, but not others. */ if (!xstrcasecmp (font->lfFaceName, "helvetica")) { === modified file 'src/w32font.h' --- src/w32font.h 2011-01-25 04:08:28 +0000 +++ src/w32font.h 2011-11-16 17:47:25 +0000 @@ -20,8 +20,8 @@ #define EMACS_W32FONT_H -/* Bit 17 of ntmFlags in NEWTEXTMETRIC is set for Postscript OpenType fonts, - bit 18 for Truetype OpenType fonts, bit 20 for Type1 fonts. */ +/* Bit 17 of ntmFlags in NEWTEXTMETRIC is set for PostScript OpenType fonts, + bit 18 for TrueType OpenType fonts, bit 20 for Type1 fonts. */ #ifndef NTM_PS_OPENTYPE #define NTM_PS_OPENTYPE 0x00020000 #endif @@ -84,4 +84,3 @@ Lisp_Object intern_font_name (char *); #endif - === modified file 'src/w32uniscribe.c' --- src/w32uniscribe.c 2011-03-23 16:25:38 +0000 +++ src/w32uniscribe.c 2011-11-16 17:47:25 +0000 @@ -507,7 +507,7 @@ if (SUCCEEDED (result) && nglyphs == 1) { /* Some fonts return .notdef glyphs instead of failing. - (Truetype spec reserves glyph code 0 for .notdef) */ + (TrueType spec reserves glyph code 0 for .notdef) */ if (glyphs[0]) code = glyphs[0]; } @@ -961,4 +961,3 @@ register_font_driver (&uniscribe_font_driver, NULL); } - === modified file 'test/ChangeLog' --- test/ChangeLog 2011-11-16 12:34:47 +0000 +++ test/ChangeLog 2011-11-16 17:47:25 +0000 @@ -1,5 +1,7 @@ 2011-11-16 Juanma Barranquero + * automated/icalendar-tests.el (icalendar-tests--get-ical-event) + (icalendar-tests--test-export, icalendar-tests--do-test-export): * cedet/srecode-tests.el (srecode-field-utest-impl): Fix typo. 2011-10-30 Ulf Jasper === modified file 'test/automated/icalendar-tests.el' --- test/automated/icalendar-tests.el 2011-07-26 15:36:04 +0000 +++ test/automated/icalendar-tests.el 2011-11-16 17:47:25 +0000 @@ -39,7 +39,7 @@ ;; ====================================================================== (defun icalendar-tests--get-ical-event (ical-string) - "Return icalendar event for ICAL-STRING." + "Return iCalendar event for ICAL-STRING." (save-excursion (with-temp-buffer (insert ical-string) @@ -219,7 +219,7 @@ (should (string= "\nDTSTART;VALUE=DATE:20100215\nDTEND;VALUE=DATE:20100216" (car result))) (should (string= "subject" (cadr result))) - + ;; with time (setq result (icalendar--convert-ordinary-to-ical "&?" "&2010 2 15 12:34-23:45 s")) @@ -424,7 +424,7 @@ Argument INPUT-ISO iso style diary string. Argument INPUT-EUROPEAN european style diary string. Argument INPUT-AMERICAN american style diary string. -Argument EXPECTED-OUTPUT expected icalendar result string. +Argument EXPECTED-OUTPUT expected iCalendar result string. European style input data must use german month names. American and ISO style input data must use english month names." @@ -467,7 +467,7 @@ (defun icalendar-tests--do-test-export (input expected-output) "Actually perform export test. Argument INPUT input diary string. -Argument EXPECTED-OUTPUT expected icalendar result string." +Argument EXPECTED-OUTPUT expected iCalendar result string." (let ((temp-file (make-temp-file "icalendar-tests-ics"))) (unwind-protect (progn @@ -732,7 +732,7 @@ "&9/19/2003 non-recurring allday\n") (icalendar-tests--test-import ;; do not remove the trailing blank after "long"! - "SUMMARY:long + "SUMMARY:long summary DTSTART;VALUE=DATE:20030919" "&2003/9/19 long summary\n" @@ -1041,7 +1041,7 @@ "&2011/7/23 event-1\n" "&23/7/2011 event-1\n" "&7/23/2011 event-1\n") - + (icalendar-tests--test-import "BEGIN:VCALENDAR PRODID:-//Emacs//NONSGML icalendar.el//EN @@ -1111,7 +1111,7 @@ (progn ;; step 1: import (icalendar-import-buffer temp-diary t t) - + ;; step 2: export what was just imported (save-excursion (find-file temp-diary) @@ -1399,7 +1399,7 @@ "DTSTART;VALUE=DATE:20050606 DTEND;VALUE=DATE:20050609 SUMMARY:ff") - + ;; export 2004-10-28 anniversary entries (icalendar-tests--test-export nil ------------------------------------------------------------ revno: 106396 committer: Ken Manheimer branch nick: trunk timestamp: Wed 2011-11-16 11:47:28 -0500 message: * python.el (python-pdbtrack-stack-entry-regexp) (python-pdbtrack-input-prompt, python-pdbtrack-track-stack-file): Adjust to recognize ipdb as well as regular python pdb prompts. Adjustments shamelessly taken exactly as suggested in EmacsWiki page: http://www.emacswiki.org/PythonProgrammingInEmacs#toc14 * allout-widgets.el: (file metadata): Attribute copyright to FSF and collapse date sequence, obscure author/maintainer email address better, remove extra version line, track relocation of author's allout webpage. * allout.el: (file metadata): Attribute copyright to FSF and collapse date sequence, obscure author/maintainer email address better, track relocation of author's allout webpage. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-16 16:37:48 +0000 +++ lisp/ChangeLog 2011-11-16 16:47:28 +0000 @@ -1,5 +1,16 @@ 2011-11-16 Ken Manheimer + * allout-widgets.el: (file metadata): Attribute copyright to FSF + and collapse date sequence, obscure author/maintainer email + address better, remove extra version line, track relocation of + author's allout webpage. + + * allout.el: (file metadata): Attribute copyright to FSF + and collapse date sequence, obscure author/maintainer email + address better, track relocation of author's allout webpage. + +2011-11-16 Ken Manheimer + * python.el (python-pdbtrack-stack-entry-regexp) (python-pdbtrack-input-prompt, python-pdbtrack-track-stack-file): Adjust to recognize ipdb as well as regular python pdb prompts. ------------------------------------------------------------ revno: 106395 committer: Ken Manheimer branch nick: trunk timestamp: Wed 2011-11-16 11:37:48 -0500 message: * python.el (python-pdbtrack-stack-entry-regexp) (python-pdbtrack-input-prompt, python-pdbtrack-track-stack-file): Adjust to recognize ipdb as well as regular python pdb prompts. Adjustments shamelessly taken exactly as suggested in EmacsWiki page: http://www.emacswiki.org/PythonProgrammingInEmacs#toc14 diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-16 12:34:47 +0000 +++ lisp/ChangeLog 2011-11-16 16:37:48 +0000 @@ -1,3 +1,11 @@ +2011-11-16 Ken Manheimer + + * python.el (python-pdbtrack-stack-entry-regexp) + (python-pdbtrack-input-prompt, python-pdbtrack-track-stack-file): + Adjust to recognize ipdb as well as regular python pdb prompts. + Adjustments shamelessly taken exactly as suggested in EmacsWiki + page: http://www.emacswiki.org/PythonProgrammingInEmacs#toc14 + 2011-11-16 Juanma Barranquero * expand.el (expand-pos, expand-index, expand-point): @@ -47,6 +55,7 @@ which wasn't being used. Add optional arg to force given state. (rmail-mime): Add optional arg to force given state. +>>>>>>> MERGE-SOURCE 2011-11-15 Juanma Barranquero * allout.el (allout-encryption-plaintext-sanitization-regexps): === modified file 'lisp/allout-widgets.el' --- lisp/allout-widgets.el 2011-11-15 07:55:13 +0000 +++ lisp/allout-widgets.el 2011-11-16 16:37:48 +0000 @@ -1,14 +1,13 @@ ;; allout-widgets.el --- Visually highlight allout outline structure. -;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Ken Manheimer +;; Copyright (C) 2005-2011 Free Software Foundation, Inc. -;; Author: Ken Manheimer -;; Maintainer: Ken Manheimer +;; Author: Ken Manheimer +;; Maintainer: Ken Manheimer ;; Version: 1.0 ;; Created: Dec 2005 -;; Version: 1.0 ;; Keywords: outlines -;; Website: http://myriadicity.net/Sundry/EmacsAllout +;; Website: http://myriadicity.net/software-and-systems/craft/emacs-allout ;;; Commentary: === modified file 'lisp/allout.el' --- lisp/allout.el 2011-11-15 17:37:37 +0000 +++ lisp/allout.el 2011-11-16 16:37:48 +0000 @@ -2,12 +2,12 @@ ;; Copyright (C) 1992-1994, 2001-2011 Free Software Foundation, Inc. -;; Author: Ken Manheimer -;; Maintainer: Ken Manheimer +;; Author: Ken Manheimer +;; Maintainer: Ken Manheimer ;; Created: Dec 1991 -- first release to usenet ;; Version: 2.3 ;; Keywords: outlines, wp, languages, PGP, GnuPG -;; Website: http://myriadicity.net/Sundry/EmacsAllout +;; Website: http://myriadicity.net/software-and-systems/craft/emacs-allout ;; This file is part of GNU Emacs. === modified file 'lisp/progmodes/python.el' --- lisp/progmodes/python.el 2011-11-09 15:00:32 +0000 +++ lisp/progmodes/python.el 2011-11-16 16:37:48 +0000 @@ -550,7 +550,7 @@ "^> \\(.*\\)(\\([0-9]+\\))\\([?a-zA-Z0-9_<>]+\\)()" "Regular expression pdbtrack uses to find a stack trace entry.") -(defconst python-pdbtrack-input-prompt "\n[(<]*[Pp]db[>)]+ " +(defconst python-pdbtrack-input-prompt "\n[(<]*[Ii]?[Pp]db[>)]+ " "Regular expression pdbtrack uses to recognize a pdb prompt.") (defconst python-pdbtrack-track-range 10000 @@ -2583,6 +2583,7 @@ (if (not (string-match (concat python-pdbtrack-input-prompt "$") block)) (python-pdbtrack-overlay-arrow nil) + (setq block (ansi-color-filter-apply block)) (setq target (python-pdbtrack-get-source-buffer block)) (if (stringp target) ------------------------------------------------------------ revno: 106394 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2011-11-16 13:34:47 +0100 message: Fix typos. diff: === modified file 'admin/grammars/c.by' --- admin/grammars/c.by 2011-11-14 23:59:56 +0000 +++ admin/grammars/c.by 2011-11-16 12:34:47 +0000 @@ -566,7 +566,7 @@ (TYPE-TAG $2 "class" nil nil ) | STRUCT symbol (TYPE-TAG $2 "struct" nil nil ) - ;; TODO: Klaus Berndl: For the moment is is ok, that we parse the C++ + ;; TODO: Klaus Berndl: For the moment it is ok, that we parse the C++ ;; keyword typename as a class.... | TYPENAME symbol (TYPE-TAG $2 "class" nil nil) === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-11-14 06:27:12 +0000 +++ doc/emacs/ChangeLog 2011-11-16 12:34:47 +0000 @@ -1,3 +1,9 @@ +2011-11-16 Juanma Barranquero + + * killing.texi (Rectangles): + * regs.texi (Rectangle Registers): + * search.texi (Isearch Yank): Fix typos. + 2011-11-06 Chong Yidong * windows.texi (Basic Window): Add xref to Cursor Display. === modified file 'doc/emacs/killing.texi' --- doc/emacs/killing.texi 2011-10-21 14:45:34 +0000 +++ doc/emacs/killing.texi 2011-11-16 12:34:47 +0000 @@ -733,7 +733,7 @@ @findex delete-rectangle There are two ways to erase the text in a rectangle: @kbd{C-x r d} (@code{delete-rectangle}) to delete the text outright, or @kbd{C-x r -k} (@code{kill-rectangle}) to remove the text and and save it as the +k} (@code{kill-rectangle}) to remove the text and save it as the @dfn{last killed rectangle}. In both cases, erasing the region-rectangle is like erasing the specified text on each line of the rectangle; if there is any following text on the line, it moves === modified file 'doc/emacs/regs.texi' --- doc/emacs/regs.texi 2011-10-15 16:37:45 +0000 +++ doc/emacs/regs.texi 2011-11-16 12:34:47 +0000 @@ -145,7 +145,7 @@ The @kbd{C-x r i @var{r}} (@code{insert-register}) command, previously documented in @ref{Text Registers}, inserts a rectangle -rather than a a text string, if the register contains a rectangle. +rather than a text string, if the register contains a rectangle. @node Configuration Registers @section Saving Window Configurations in Registers === modified file 'doc/emacs/search.texi' --- doc/emacs/search.texi 2011-11-06 06:14:01 +0000 +++ doc/emacs/search.texi 2011-11-16 12:34:47 +0000 @@ -309,7 +309,7 @@ @findex isearch-yank-char @kbd{C-M-w} (@code{isearch-del-char}) deletes the last character from the search string, and @kbd{C-M-y} (@code{isearch-yank-char}) -appends the character after point to the the search string. An +appends the character after point to the search string. An alternative method to add the character after point is to enter the minibuffer with @kbd{M-e} (@pxref{Repeat Isearch}) and type @kbd{C-f} at the end of the search string in the minibuffer. === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-11-15 17:37:37 +0000 +++ doc/misc/ChangeLog 2011-11-16 12:34:47 +0000 @@ -73,7 +73,7 @@ Release MH-E manual version 8.3. - * mh-e.texi: (VERSION, EDITION, UPDATED, UPDATE-MONTH): Update for + * mh-e.texi (VERSION, EDITION, UPDATED, UPDATE-MONTH): Update for release 8.3. (Preface): Updated support information. (From Bill Wohler): Reset text to original version. As a === modified file 'leim/ChangeLog' --- leim/ChangeLog 2011-11-15 17:37:37 +0000 +++ leim/ChangeLog 2011-11-16 12:34:47 +0000 @@ -1,4 +1,4 @@ -2011-09-27 Jambunathan K +2011-09-27 Jambunathan K * quail/indian.el (quail-tamil-itrans-misc-table): Delete it. (quail-tamil-itrans-numerics-and-symbols-table) === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2011-11-14 22:54:16 +0000 +++ lib-src/ChangeLog 2011-11-16 12:34:47 +0000 @@ -5134,7 +5134,7 @@ 1996-03-15 Anders Lindgren - * etags.c: Prolog language totaly rewritten. + * etags.c: Prolog language totally rewritten. (Prolog_functions): Rewritten from scratch. (skip_comment, prolog_getit): Removed. (prolog_skip_comment): New function, like old skip_comment. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-16 10:10:40 +0000 +++ lisp/ChangeLog 2011-11-16 12:34:47 +0000 @@ -1,3 +1,16 @@ +2011-11-16 Juanma Barranquero + + * expand.el (expand-pos, expand-index, expand-point): + Remove redundant info from docstring. + (expand-add-abbrevs): Doc fix. + (expand-c-sample-expand-list, expand-sample-lisp-mode-expand-list) + (expand-sample-perl-mode-expand-list): Fix typos. + + * net/dbus.el (dbus-event-member-name): + * play/5x5.el (5x5-solve-rotate-left, 5x5-solver-output): + * term/pc-win.el (msdos-create-frame-with-faces): + * textmodes/texinfmt.el (texinfo-format-image): Fix typos. + 2011-11-16 Martin Rudalics * window.el (split-window, window-state-get-1) @@ -464,11 +477,10 @@ * progmodes/cc-defs.el: Update "virtual semicolon" comments. * progmodes/cc-engine.el (c-crosses-statement-barrier-p): - Recode to scan one line at at time rather than having \n and \r - explicitly in c-stmt-delim-chars - (for some modes, e.g. AWK). + Recode to scan one line at time rather than having \n and \r + explicitly in c-stmt-delim-chars (for some modes, e.g. AWK). (c-forward-label): Amend for virtual semicolons. - (c-at-macro-vsemi-p, c-macro-vsemi-status-unknown-p): New functions + (c-at-macro-vsemi-p, c-macro-vsemi-status-unknown-p): New functions. * progmodes/cc-fonts.el (c-font-lock-declarations): Take account of the new C macros. @@ -485,7 +497,7 @@ * progmodes/cc-vars.el (c-macro-with-semi-re): (c-macro-names-with-semicolon): New variables. - (c-make-macro-with-semi-re): New function + (c-make-macro-with-semi-re): New function. 2011-10-28 Stefan Monnier @@ -2558,13 +2570,13 @@ 2011-08-20 Alan Mackenzie - * Fontify CPP expressions correctly when starting in the middle of + Fontify CPP expressions correctly when starting in the middle of such a construct. Mainly for when jit-lock etc. starts a chunk here. - * progmodes/cc-fonts.el (c-font-lock-context): new buffer local + * progmodes/cc-fonts.el (c-font-lock-context): New buffer local variable. - (c-make-font-lock-search-form): new function, extracted from + (c-make-font-lock-search-form): New function, extracted from c-make-font-lock-search-function. (c-make-font-lock-search-function): Use the above function. (c-make-font-lock-context-search-function): New function. @@ -2895,7 +2907,7 @@ * progmodes/cc-fonts.el (c-font-lock-declarations): Jump over the QT keyword "more" to prevent "more slots: ...." being spuriously - parsed as a bitfield declaraion. + parsed as a bitfield declaration. * progmodes/cc-engine.el (c-beginning-of-statement-1): Refactor and enhance to handle bitfield declarations. @@ -5640,7 +5652,7 @@ * image-mode.el (image-toggle-display-image): Ensure that the image spec passed to the animate timer is the same object as in - the the buffer's display property (Bug#6981). + the buffer's display property (Bug#6981). (image-transform-properties): Doc fix. * image.el (image-animate-max-time): Default to nil. === modified file 'lisp/ChangeLog.10' --- lisp/ChangeLog.10 2011-11-15 17:37:37 +0000 +++ lisp/ChangeLog.10 2011-11-16 12:34:47 +0000 @@ -4332,7 +4332,7 @@ 2003-04-01 Stefan Monnier - * progmodes/asm-mode.el (asm-mode-syntax-table): Setup entries + * progmodes/asm-mode.el (asm-mode-syntax-table): Setup entries that do not depend on asm-comment-char. (asm-mode-map): Declare and init at the same time. (asm-code-level-empty-comment-pattern) @@ -9632,7 +9632,7 @@ named ucs-translation-table-for-decode vacant. If FOR-ENCODE is non-nil, make a proper char-table populates the translation table name utf-translation-table-for-encode. Call register-char-codings - for all mule-utf-* to to reset their status to the original. + for all mule-utf-* to reset their status to the original. (unify-8859-on-encoding-mode): Call ucs-unify-8859 and ucs-fragment-8859 with fixed arguments. Set the version to 21.3. (unify-8859-on-decoding-mode): Likewise. Remove dependency. @@ -10545,7 +10545,7 @@ 2002-09-22 Kai Großjohann - * dired.el (dired-insert-directory): Always add "--dired" to to + * dired.el (dired-insert-directory): Always add "--dired" to SWITCHES for remote files. * files.el (insert-directory): Comment saying that "--dired" might be in the SWITCHES. @@ -11617,7 +11617,7 @@ * emacs-lisp/bytecomp.el (byte-compile-warning-prefix): Decide here whether to print which form we're compiling. If we do that, still print file and line. Make file name - relative to default-directory. Print fewer newlines. + relative to default-directory. Print fewer newlines. (byte-compile-log-file): Print something even if no file. Print messages for entering and leaving directories, and set default-directory. @@ -12899,7 +12899,7 @@ * timer.el (timer-inc-time): Doc fix. * replace.el (keep-lines, flush-lines): Interactively report - read-only error before reading regexp argument. + read-only error before reading regexp argument. * dabbrev.el (dabbrev--search): Use inhibit-point-motion-hooks. @@ -21105,12 +21105,12 @@ so that the next undo after an error will not begin redoing. * simple.el (shell-command): Doc fix. - (shell-command-on-region): If there is output an an error, + (shell-command-on-region): If there is output and an error, add "...Shell command failed" to the output. 2001-12-13 David Ponce - * ruler-mode.el (ruler-mode-left-fringe-cols): Variable removed. + * ruler-mode.el (ruler-mode-left-fringe-cols): Variable removed. (ruler-mode-left-fringe-cols): Function replaced by more efficient implementation `ruler-mode-extra-left-cols'. (ruler-mode-ruler): Use above new function. Take into account === modified file 'lisp/ChangeLog.12' --- lisp/ChangeLog.12 2011-11-15 17:37:37 +0000 +++ lisp/ChangeLog.12 2011-11-16 12:34:47 +0000 @@ -8855,7 +8855,7 @@ (org-get-indentation): New optional argument LINE. (org-fix-indentation, org-remove-tabs): New functions. (org-export-as-ascii, org-ascii-level-start): Determine and apply - correct indentation for headlines that are converted it items. + correct indentation for headlines that are converted to items. (org-skip-comments): Remove table lines that contain narrowing cookies but no other non-empty fields. (org-set-tags): Allow groups of mutually exclusive tags. @@ -16884,7 +16884,7 @@ * progmodes/cc-fonts.el (c-font-lock-complex-decl-prepare) (c-font-lock-declarators, c-font-lock-declarations) (c-complex-decl-matchers, c-basic-matchers-after): Use a text - property to mark the items in in declarator lists to handle + property to mark the items in declarator lists to handle refontification inside multiline declarations better. * progmodes/cc-fonts.el (c-font-lock-declarations): Recognize a === modified file 'lisp/button.el' --- lisp/button.el 2011-07-05 20:44:55 +0000 +++ lisp/button.el 2011-11-16 12:34:47 +0000 @@ -42,7 +42,7 @@ ;; button face may not be visible. Using overlays avoids this. ;; ;; Using `define-button-type' to define default properties for buttons -;; is not necessary, but it is is encouraged, since doing so makes the +;; is not necessary, but it is encouraged, since doing so makes the ;; resulting code clearer and more efficient. ;; === modified file 'lisp/cedet/ChangeLog' --- lisp/cedet/ChangeLog 2011-11-15 00:54:19 +0000 +++ lisp/cedet/ChangeLog 2011-11-16 12:34:47 +0000 @@ -1,3 +1,9 @@ +2011-11-16 Juanma Barranquero + + * semantic/lex.el (semantic-lex-tokens): + * semantic/tag-ls.el (semantic-tag-protected-p): + * srecode/mode.el (srecode-prefix-map): Fix typos. + 2011-11-15 Juanma Barranquero * ede/project-am.el (project-compile-target-command): Fix typo. === modified file 'lisp/cedet/semantic/lex.el' --- lisp/cedet/semantic/lex.el 2011-11-15 07:55:13 +0000 +++ lisp/cedet/semantic/lex.el 2011-11-16 12:34:47 +0000 @@ -491,7 +491,7 @@ (symbol) (whitespace) ) - "An alist of of semantic token types. + "An alist of semantic token types. As of December 2001 (semantic 1.4beta13), this variable is not used in any code. The only use is to refer to the doc-string from elsewhere. @@ -1758,7 +1758,7 @@ (semantic-alias-obsolete 'semantic-flex-map-keywords 'semantic-lex-map-keywords "23.2") (semantic-alias-obsolete 'semantic-flex-keywords 'semantic-lex-keywords "23.2") (semantic-alias-obsolete 'semantic-flex-buffer 'semantic-lex-buffer "23.2") -(semantic-alias-obsolete 'semantic-flex-list 'semantic-lex-list "23.2") +(semantic-alias-obsolete 'semantic-flex-list 'semantic-lex-list "23.2") ;; This simple scanner uses the syntax table to generate a stream of ;; simple tokens of the form: @@ -1769,7 +1769,7 @@ ;; objects boundary. (defvar semantic-flex-tokens semantic-lex-tokens - "An alist of of semantic token types. + "An alist of semantic token types. See variable `semantic-lex-tokens'.") (defvar semantic-flex-unterminated-syntax-end-function === modified file 'lisp/cedet/semantic/tag-ls.el' --- lisp/cedet/semantic/tag-ls.el 2011-11-15 07:55:13 +0000 +++ lisp/cedet/semantic/tag-ls.el 2011-11-16 12:34:47 +0000 @@ -98,7 +98,7 @@ prot)) (defun semantic-tag-protected-p (tag protection &optional parent) - "Non-nil if TAG is is protected. + "Non-nil if TAG is protected. PROTECTION is a symbol which can be returned by the method `semantic-tag-protection'. PARENT is the parent data type which contains TAG. @@ -106,7 +106,7 @@ For these PROTECTIONs, true is returned if TAG is: @table @asis @item nil - Always true + Always true. @item private True if nil. @item protected === modified file 'lisp/cedet/srecode/mode.el' --- lisp/cedet/srecode/mode.el 2011-11-13 07:48:23 +0000 +++ lisp/cedet/srecode/mode.el 2011-11-16 12:34:47 +0000 @@ -61,7 +61,7 @@ (define-key km (format "%c" k) 'srecode-bind-insert) (setq k (1+ k)))) km) - "Keymap used behind the srecode prefix key in in srecode minor mode.") + "Keymap used behind the srecode prefix key in srecode minor mode.") (defvar srecode-menu-bar (list === modified file 'lisp/emacs-lisp/smie.el' --- lisp/emacs-lisp/smie.el 2011-11-14 06:27:12 +0000 +++ lisp/emacs-lisp/smie.el 2011-11-16 12:34:47 +0000 @@ -130,7 +130,7 @@ ;; - a 2 dimensional precedence table (key word "prec2"), is a 2D ;; table recording the precedence relation (can be `<', `=', `>', or ;; nil) between each pair of tokens. -;; - a precedence-level table (key word "grammar"), which is a alist +;; - a precedence-level table (key word "grammar"), which is an alist ;; giving for each token its left and right precedence level (a ;; number or nil). This is used in `smie-grammar'. ;; The prec2 tables are only intermediate data structures: the source === modified file 'lisp/emacs-lisp/tcover-unsafep.el' --- lisp/emacs-lisp/tcover-unsafep.el 2011-05-23 17:57:17 +0000 +++ lisp/emacs-lisp/tcover-unsafep.el 2011-11-16 12:34:47 +0000 @@ -100,7 +100,7 @@ . (risky-local-variable format-alist)) ( (setq buffer-display-count (delete-file "x")) . (function delete-file)) - ;;These are actualy safe (they signal errors) + ;;These are actually safe (they signal errors) ( (apply '(x) '(1 2 3)) . (function (x))) ( (let (((x))) 1) === modified file 'lisp/expand.el' --- lisp/expand.el 2011-04-19 13:44:55 +0000 +++ lisp/expand.el 2011-11-16 12:34:47 +0000 @@ -111,7 +111,7 @@ ("while" "while () {\n\n}" (8 12)) ("default" "default:\n\nbreak;" 10) ("main" "int\nmain(int argc, char * argv[])\n{\n\n}\n" 37)) - "Expansions for C mode. See `expand-add-abbrevs'.") + "Expansions for C mode. See `expand-add-abbrevs'.") ;; lisp example from Jari Aalto (defconst expand-sample-lisp-mode-expand-list @@ -181,7 +181,7 @@ (list 12 14)) ) - "Expansions for Lisp mode. See `expand-add-abbrevs'.") + "Expansions for Lisp mode. See `expand-add-abbrevs'.") ;; perl example from Jari Aalto (defconst expand-sample-perl-mode-expand-list @@ -257,20 +257,20 @@ (list "rtu" "return ;" (list 8)) ) - "Expansions for Perl mode. See `expand-add-abbrevs'.") + "Expansions for Perl mode. See `expand-add-abbrevs'.") ;;; Code: ;;;###autoload (defun expand-add-abbrevs (table abbrevs) - "Add a list of abbrev to abbrev table TABLE. + "Add a list of abbreviations to abbrev table TABLE. ABBREVS is a list of abbrev definitions; each abbrev description entry has the form (ABBREV EXPANSION ARG). ABBREV is the abbreviation to replace. EXPANSION is the replacement string or a function which will make the -expansion. For example you, could use the DMacros or skeleton packages +expansion. For example, you could use the DMacros or skeleton packages to generate such functions. ARG is an optional argument which can be a number or a list of @@ -279,7 +279,7 @@ If ARG is a list of numbers, point is placed according to the first member of the list, but you can visit the other specified positions -cyclicaly with the functions `expand-jump-to-previous-slot' and +cyclically with the functions `expand-jump-to-previous-slot' and `expand-jump-to-next-slot'. If ARG is omitted, point is placed at the end of the expanded text." @@ -293,18 +293,15 @@ (defvar expand-list nil "Temporary variable used by the Expand package.") (defvar expand-pos nil - "If non-nil, stores a vector containing markers to positions defined by the last expansion. -This variable is local to a buffer.") + "If non-nil, stores a vector containing markers to positions defined by the last expansion.") (make-variable-buffer-local 'expand-pos) (defvar expand-index 0 - "Index of the last marker used in `expand-pos'. -This variable is local to a buffer.") + "Index of the last marker used in `expand-pos'.") (make-variable-buffer-local 'expand-index) (defvar expand-point nil - "End of the expanded region. -This variable is local to a buffer.") + "End of the expanded region.") (make-variable-buffer-local 'expand-point) (defun expand-add-abbrev (table abbrev expansion arg) === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-11-15 17:37:37 +0000 +++ lisp/gnus/ChangeLog 2011-11-16 12:34:47 +0000 @@ -1,3 +1,8 @@ +2011-11-16 Juanma Barranquero + + * registry.el (registry-lookup, registry-lookup-breaks-before-lexbind): + Fix typos. + 2011-11-15 Juanma Barranquero * gnus-art.el (gnus-article-part-wrapper): @@ -4429,7 +4434,7 @@ gnus-original-article-buffer is alive. * nndoc.el (nndoc-dissect-buffer): Reverse the order of the articles to - reflect the order they're in in the digest. + reflect the order they are in the digest. * gnus.el (gnus-group-startup-message): Move point to the start of the buffer. === modified file 'lisp/gnus/ChangeLog.1' --- lisp/gnus/ChangeLog.1 2011-11-15 17:37:37 +0000 +++ lisp/gnus/ChangeLog.1 2011-11-16 12:34:47 +0000 @@ -1336,7 +1336,7 @@ 1998-05-07 Hrvoje Niksic - * nnmail.el: (nnmail-get-split-group): Use `regexp-quote' + * nnmail.el (nnmail-get-split-group): Use `regexp-quote' when file name is a part of pattern. * nnmail.el (nnmail-crosspost-link-function): Ditto. === modified file 'lisp/gnus/gnus-agent.el' --- lisp/gnus/gnus-agent.el 2011-09-11 22:50:22 +0000 +++ lisp/gnus/gnus-agent.el 2011-11-16 12:34:47 +0000 @@ -3613,7 +3613,7 @@ (setq r d d (directory-file-name d))) ;; if ANY ancestor was NOT in keep hash and - ;; it it's already in to-remove, add it to + ;; it's already in to-remove, add it to ;; to-remove. (if (and r (not (member r to-remove))) === modified file 'lisp/gnus/registry.el' --- lisp/gnus/registry.el 2011-05-13 04:12:37 +0000 +++ lisp/gnus/registry.el 2011-11-16 12:34:47 +0000 @@ -149,7 +149,7 @@ (defmethod registry-lookup ((db registry-db) keys) "Search for KEYS in the registry-db THIS. -Returns a alist of the key followed by the entry in a list, not a cons cell." +Returns an alist of the key followed by the entry in a list, not a cons cell." (let ((data (oref db :data))) (delq nil (mapcar @@ -160,7 +160,7 @@ (defmethod registry-lookup-breaks-before-lexbind ((db registry-db) keys) "Search for KEYS in the registry-db THIS. -Returns a alist of the key followed by the entry in a list, not a cons cell." +Returns an alist of the key followed by the entry in a list, not a cons cell." (let ((data (oref db :data))) (delq nil (loop for key in keys === modified file 'lisp/mh-e/ChangeLog' --- lisp/mh-e/ChangeLog 2011-09-20 04:56:51 +0000 +++ lisp/mh-e/ChangeLog 2011-11-16 12:34:47 +0000 @@ -1,3 +1,7 @@ +2011-11-16 Juanma Barranquero + + * mh-search.el (mh-pick-parse-search-buffer): Fix typo. + 2011-09-20 Bill Wohler Release MH-E version 8.3. @@ -40,7 +44,7 @@ switch-to-buffer. The previous change which used pop-to-buffer produced the wrong behavior. -2011-07-12 Henrique Martins (tiny change) +2011-07-12 Henrique Martins (tiny change) * mh-xface.el (mh-picon-get-image): Remove quote from block argument. === modified file 'lisp/mh-e/ChangeLog.1' --- lisp/mh-e/ChangeLog.1 2011-11-15 00:54:19 +0000 +++ lisp/mh-e/ChangeLog.1 2011-11-16 12:34:47 +0000 @@ -1484,7 +1484,7 @@ * mh-alias.el (Commentary): Removed as it is now in the manual. (mh-alias-system-aliases): Moved here from mh-customize.el. By definition, "system" definitions are not user-visible, and user - filenames are in the the Aliasfile: profile component, so this + filenames are in the Aliasfile: profile component, so this variable really shouldn't be a defcustom. (mh-alias-tstamp, mh-alias-filenames, mh-alias-reload) (mh-alias-add-alias, mh-alias-grab-from-field) @@ -4533,7 +4533,7 @@ * mh-xemacs-toolbar.el: Remove the code since that gets generated when mh-tool-bar-define is expanded. - (mh-xemacs-icon-map): A alist to map GNU Emacs icon names to the + (mh-xemacs-icon-map): An alist to map GNU Emacs icon names to the actual icons to be used in XEmacs. This is used in mh-tool-bar-define. @@ -5022,7 +5022,7 @@ * mh-utils.el (mh-truncate-log-buffer): Modify the function to return the current size of mh-log-buffer. Also we are now a bit more careful in adding separators between consecutive messages. - (mh-exec-cmd): Fix a bug where the the log buffer would be + (mh-exec-cmd): Fix a bug where the log buffer would be displayed even if no error happened in the current command but the log buffer had messages from a previous error. @@ -8594,7 +8594,7 @@ mail-header-separator. (mh-send-letter): The default BCC encapsulation will make a MIME message unreadable. If we are running nmh and the letter contains - a Bcc: and a Content-Type: field, add the -mime switch to to the + a Bcc: and a Content-Type: field, add the -mime switch to the arguments to send. 2002-10-21 Peter S Galbraith @@ -9610,7 +9610,7 @@ 2002-06-27 Satyaki Das * mh-e.el (mh-next-undeleted-msg): Get rid of optional arg - reverse-p. If there are no more undeleted messages the the point + reverse-p. If there are no more undeleted messages the point remains at its original position and a message is produced (closes SF #494304). (mh-previous-undeleted-msg): Change similar to @@ -11049,7 +11049,7 @@ line, starting with Re: (mh-scan-body-regexp): Regexp matching the message body beginning displayed in scan lines. - (mh-scan.font-lock-regexp): Regexp matching output of the the + (mh-scan.font-lock-regexp): Regexp matching output of the optional scan.font-lock format file. (mh-folder-font-lock-keywords): New font-lock for folder-mode that uses the above regexps. === modified file 'lisp/mh-e/mh-search.el' --- lisp/mh-e/mh-search.el 2011-11-15 07:55:13 +0000 +++ lisp/mh-e/mh-search.el 2011-11-16 12:34:47 +0000 @@ -646,7 +646,7 @@ (defun mh-pick-parse-search-buffer () "Parse the search buffer contents. -The function returns a alist. The car of each element is either +The function returns an alist. The car of each element is either the header name to search in or nil to search the whole message. The cdr of the element is the pattern to search." (save-excursion === modified file 'lisp/net/dbus.el' --- lisp/net/dbus.el 2011-11-13 07:48:23 +0000 +++ lisp/net/dbus.el 2011-11-16 12:34:47 +0000 @@ -505,7 +505,7 @@ (defun dbus-event-member-name (event) "Return the member name the event is coming from. -It is either a signal name or a method name. The result is is a +It is either a signal name or a method name. The result is a string. EVENT is a D-Bus event, see `dbus-check-event'. This function raises a `dbus-error' signal in case the event is not well formed." === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2011-10-19 20:21:35 +0000 +++ lisp/net/tramp.el 2011-11-16 12:34:47 +0000 @@ -3851,7 +3851,7 @@ ;; expects English? Or just to set LC_MESSAGES to "C" if Tramp ;; expects only English messages? (Juri Linkov) ;; * Make shadowfile.el grok Tramp filenames. (Bug#4526, Bug#4846) -;; * I was wondering it it would be possible to use tramp even if I'm +;; * I was wondering if it would be possible to use tramp even if I'm ;; actually using sshfs. But when I launch a command I would like ;; to get it executed on the remote machine where the files really ;; are. (Andrea Crotti) === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2011-11-15 17:37:37 +0000 +++ lisp/org/ChangeLog 2011-11-16 12:34:47 +0000 @@ -1,3 +1,9 @@ +2011-11-16 Juanma Barranquero + + * org-agenda.el (org-create-marker-find-array): + * org-bibtex.el (org-bibtex-fields): + * org-list.el (org-list-insert-item): Fix typos. + 2011-11-11 Juanma Barranquero * org-plot.el (org-plot/gnuplot-to-grid-data): Fix typo in docstring. @@ -3499,7 +3505,7 @@ * org.el (org-set-autofill-regexps): Use `org-item-re' in `paragraph-start' to recognize alphabetical lists. (org-fill-paragraph): Enforce a pre-computed fill-prefix before - calling `fill-paragraph' when point in in an item. Also prevent + calling `fill-paragraph' when point is in an item. Also prevent paragraphs getting merged into an adjacent list upon filling. (org-adaptive-fill-function): Make sure to determine real fill-prefix for auto-fill. @@ -11440,7 +11446,7 @@ package. * org-latex.el (org-export-latex-tables): Only add a caption when - macro in in longtable environments if one has been defined. + macro is in longtable environments if one has been defined. * org-html.el (org-export-as-html): Only take title from buffer if not exporting body-only. === modified file 'lisp/org/org-agenda.el' --- lisp/org/org-agenda.el 2011-11-15 17:37:37 +0000 +++ lisp/org/org-agenda.el 2011-11-16 12:34:47 +0000 @@ -2972,7 +2972,7 @@ (nreverse markers))) (defun org-create-marker-find-array (marker-list) - "Create a alist of files names with all marker positions in that file." + "Create an alist of files names with all marker positions in that file." (let (f tbl m a p) (while (setq m (pop marker-list)) (setq p (marker-position m) === modified file 'lisp/org/org-bibtex.el' --- lisp/org/org-bibtex.el 2011-08-18 20:41:06 +0000 +++ lisp/org/org-bibtex.el 2011-11-16 12:34:47 +0000 @@ -204,7 +204,7 @@ (:pages . "One or more page numbers or range of numbers, such as 42-111 or 7,41,73-97 or 43+ (the ‘+’ in this last example indicates pages following that don’t form simple range). BibTEX requires double dashes for page ranges (--).") (:publisher . "The publisher’s name.") (:school . "The name of the school where a thesis was written.") - (:series . "The name of a series or set of books. When citing an entire book, the the title field gives its title and an optional series field gives the name of a series or multi-volume set in which the book is published.") + (:series . "The name of a series or set of books. When citing an entire book, the title field gives its title and an optional series field gives the name of a series or multi-volume set in which the book is published.") (:title . "The work’s title, typed as explained in the LaTeX book.") (:type . "The type of a technical report for example, 'Research Note'.") (:volume . "The volume of a journal or multi-volume book.") === modified file 'lisp/org/org-list.el' --- lisp/org/org-list.el 2011-11-14 20:23:26 +0000 +++ lisp/org/org-list.el 2011-11-16 12:34:47 +0000 @@ -1207,7 +1207,7 @@ If POS is before first character after bullet of the item, the new item will be created before the current one. -STRUCT is the list structure. PREVS is the the alist of previous +STRUCT is the list structure. PREVS is the alist of previous items, as returned by `org-list-prevs-alist'. Insert a checkbox if CHECKBOX is non-nil, and string AFTER-BULLET === modified file 'lisp/play/5x5.el' --- lisp/play/5x5.el 2011-11-14 23:59:56 +0000 +++ lisp/play/5x5.el 2011-11-16 12:34:47 +0000 @@ -151,7 +151,7 @@ "Local keymap for the 5x5 game.") (5x5-defvar-local 5x5-solver-output nil - "List that is is the output of an arithmetic solver. + "List that is the output of an arithmetic solver. This list L is such that @@ -816,9 +816,8 @@ strokes --- other solutions can be viewed by rotating through the list. The list of solution is ordered by number of strokes, so rotating left just after calling `5x5-solve-suggest' will show -the the solution with second least number of strokes, while -rotating right will show the solution with greatest number of -strokes." +the solution with second least number of strokes, while rotating +right will show the solution with greatest number of strokes." (interactive "P") (let ((len (length 5x5-solver-output))) (when (>= len 3) === modified file 'lisp/progmodes/ada-mode.el' --- lisp/progmodes/ada-mode.el 2011-04-22 18:44:26 +0000 +++ lisp/progmodes/ada-mode.el 2011-11-16 12:34:47 +0000 @@ -105,8 +105,8 @@ ;; should be loaded before the ada-mode, which will then setup some variables ;; to improve the support for Ada code. ;; Here is the list of these modes: -;; `which-function-mode': Display the name of the subprogram the cursor is -;; in in the mode line. +;; `which-function-mode': Display in the modeline the name of the subprogram +;; the cursor is in. ;; `outline-mode': Provides the capability to collapse or expand the code ;; for specific language constructs, for instance if you want to hide the ;; code corresponding to a subprogram === modified file 'lisp/progmodes/cc-engine.el' --- lisp/progmodes/cc-engine.el 2011-11-15 17:37:37 +0000 +++ lisp/progmodes/cc-engine.el 2011-11-16 12:34:47 +0000 @@ -8832,7 +8832,7 @@ ;; CASE B.4: Continued statement with block open. The most ;; accurate analysis is perhaps `statement-cont' together with ;; `block-open' but we play DWIM and use `substatement-open' - ;; instead. The rationaly is that this typically is a macro + ;; instead. The rationale is that this typically is a macro ;; followed by a block which makes it very similar to a ;; statement with a substatement block. (t === modified file 'lisp/progmodes/tcl.el' --- lisp/progmodes/tcl.el 2011-04-22 18:44:26 +0000 +++ lisp/progmodes/tcl.el 2011-11-16 12:34:47 +0000 @@ -861,7 +861,7 @@ expr-p) (progn ;; Line is continuation line, or the sexp opener - ;; is not a curly brace, or we are are looking at + ;; is not a curly brace, or we are looking at ;; an `expr' expression (which must be split ;; specially). So indentation is column of first ;; good spot after sexp opener (with some added === modified file 'lisp/term/pc-win.el' --- lisp/term/pc-win.el 2011-01-26 08:36:39 +0000 +++ lisp/term/pc-win.el 2011-11-16 12:34:47 +0000 @@ -134,7 +134,7 @@ ;; terminal-initialization function. Also, our handling of reverse ;; video is slightly different. (defun msdos-create-frame-with-faces (&optional parameters) - "Create an frame on MS-DOS display. + "Create a frame on MS-DOS display. Optional frame parameters PARAMETERS specify the frame parameters. Parameters not specified by PARAMETERS are taken from `default-frame-alist'. If either PARAMETERS or `default-frame-alist' === modified file 'lisp/textmodes/page-ext.el' --- lisp/textmodes/page-ext.el 2011-01-26 08:36:39 +0000 +++ lisp/textmodes/page-ext.el 2011-11-16 12:34:47 +0000 @@ -435,7 +435,7 @@ (skip-chars-forward " \t\n") )) - ;; ENDRECFUN is is called with point within the record. + ;; ENDRECFUN is called with point within the record. ;; It should move point to the end of the record. (function (lambda () (if (re-search-forward === modified file 'lisp/textmodes/texinfmt.el' --- lisp/textmodes/texinfmt.el 2011-01-26 08:36:39 +0000 +++ lisp/textmodes/texinfmt.el 2011-11-16 12:34:47 +0000 @@ -2194,7 +2194,7 @@ (put 'image 'texinfo-format 'texinfo-format-image) (defun texinfo-format-image () - "Insert an image from an an file ending in .txt. + "Insert an image from a file ending in .txt. Use only the FILENAME arg; for Info, ignore the other arguments to @image." (let ((args (texinfo-format-parse-args)) filename) @@ -3909,11 +3909,11 @@ ;;; @set, @clear, @ifset, @ifclear ;; If a flag is set with @set FLAG, then text between @ifset and @end -;; ifset is formatted normally, but if the flag is is cleared with +;; ifset is formatted normally, but if the flag is cleared with ;; @clear FLAG, then the text is not formatted; it is ignored. ;; If a flag is cleared with @clear FLAG, then text between @ifclear -;; and @end ifclear is formatted normally, but if the flag is is set with +;; and @end ifclear is formatted normally, but if the flag is set with ;; @set FLAG, then the text is not formatted; it is ignored. @ifclear ;; is the opposite of @ifset. === modified file 'nt/ChangeLog' --- nt/ChangeLog 2011-11-15 18:08:38 +0000 +++ nt/ChangeLog 2011-11-16 12:34:47 +0000 @@ -13,7 +13,7 @@ (INT32_MIN, UINTMAX_MAX, UINTMAX_MIN, INTMAX_MAX, INTMAX_MIN) (intmax_t, INT64_MAX): Add for MSVC. - * config.nt: (mode_t) [!__GNUC__]: Define mode_t for MSVC. + * config.nt (mode_t) [!__GNUC__]: Define mode_t for MSVC. 2011-11-05 Eli Zaretskii @@ -28,7 +28,7 @@ * INSTALL: Update for newer versions of MSVC. -2011-11-05 Fabrice Popineau (tiny change) +2011-11-05 Fabrice Popineau (tiny change) Support MSVC build with newer versions of Visual Studio. * nmake.defs (USE_CRT_DLL): Define to 1. === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-16 10:10:40 +0000 +++ src/ChangeLog 2011-11-16 12:34:47 +0000 @@ -1,3 +1,7 @@ +2011-11-16 Juanma Barranquero + + * window.c (syms_of_window) : Fix typo. + 2011-11-16 Martin Rudalics * window.h (window): Rename slot "nest" to "combination_limit". @@ -259,7 +263,7 @@ * w32fns.c [_MSC_VER]: DECLARE_HANDLE for any MSVC version. -2011-11-05 Fabrice Popineau (tiny change) +2011-11-05 Fabrice Popineau (tiny change) Support MSVC build with newer versions of Visual Studio. * w32.c: Don't include w32api.h for MSVC. @@ -321,7 +325,7 @@ * xdisp.c (try_cursor_movement): Make sure ROW isn't decremented past the beginning of the current glyph matrix. -2011-10-30 Adam Sjøgren (tiny change) +2011-10-30 Adam Sjøgren (tiny change) * xterm.c: Include X11/Xproto.h if HAVE_GTK3. (x_error_handler): Ignore BadMatch for X_SetInputFocus for @@ -3049,7 +3053,7 @@ * nsselect.m (ns_string_from_pasteboard): Don't use deprecated methods cString and lossyCString on OSX >= 10.4 - * nsmenu.m (fillWithWidgetValue): Don't use depercated method + * nsmenu.m (fillWithWidgetValue): Don't use deprecated method sizeToFit on OSX >= 10.2. * nsimage.m (allocInitFromFile): Don't use deprecated method === modified file 'src/ChangeLog.1' --- src/ChangeLog.1 2011-11-14 20:23:26 +0000 +++ src/ChangeLog.1 2011-11-16 12:34:47 +0000 @@ -405,7 +405,7 @@ Copy their own header field a_scovfrl from ohdr. * unexec.c [COFF]: - Round positions of text and and data sections in output file + Round positions of text and data sections in output file to page boundaries. * crt0.c: Install version for Encore machines. === modified file 'src/frame.c' --- src/frame.c 2011-11-07 09:51:08 +0000 +++ src/frame.c 2011-11-16 12:34:47 +0000 @@ -1237,7 +1237,7 @@ else { #ifdef HAVE_X_WINDOWS - /* Also, save clipboard to the the clipboard manager. */ + /* Also, save clipboard to the clipboard manager. */ x_clipboard_manager_save_frame (frame); #endif === modified file 'src/window.c' --- src/window.c 2011-11-16 10:10:40 +0000 +++ src/window.c 2011-11-16 12:34:47 +0000 @@ -6506,7 +6506,7 @@ doc: /* Non-nil means splitting a window makes a new parent window. If this variable is nil, splitting a window will create a new parent window only if the window has no parent window or the window shall -become a combination orthogonal to the one it it is part of. +become a combination orthogonal to the one it is part of. If this variable is t, splitting a window always creates a new parent window. If all splits behave this way, each frame's window tree is a @@ -6515,7 +6515,7 @@ Other values are reserved for future use. -The value of this variable is also assigned to the combination_limit +The value of this variable is also assigned to the combination-limit status of the new parent window. The combination-limit status of a window can be retrieved via the function `window-combination-limit' and altered by the function `set-window-combination-limit'. */); === modified file 'test/ChangeLog' --- test/ChangeLog 2011-10-30 15:21:37 +0000 +++ test/ChangeLog 2011-11-16 12:34:47 +0000 @@ -1,3 +1,7 @@ +2011-11-16 Juanma Barranquero + + * cedet/srecode-tests.el (srecode-field-utest-impl): Fix typo. + 2011-10-30 Ulf Jasper * automated/newsticker-tests.el === modified file 'test/cedet/srecode-tests.el' --- test/cedet/srecode-tests.el 2011-01-25 04:08:28 +0000 +++ test/cedet/srecode-tests.el 2011-11-16 12:34:47 +0000 @@ -177,7 +177,7 @@ (mapc (lambda (T) (when (slot-boundp T 'overlay) - (error "Overlay did not clear off of of field %s" + (error "Overlay did not clear off of field %s" (object-name T)))) fields) ------------------------------------------------------------ revno: 106393 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-11-16 06:22:17 -0500 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2011-11-16 03:17:29 +0000 +++ lisp/mail/rmail.el 2011-11-16 11:22:17 +0000 @@ -4439,7 +4439,7 @@ ;;; Start of automatically extracted autoloads. ;;;### (autoloads (rmail-edit-current-message) "rmailedit" "rmailedit.el" -;;;;;; "090ad9432c3bf9a6098bb9c3d7c71baf") +;;;;;; "7f9bff22ed0bbac561c97fd1e3ab503d") ;;; Generated autoloads from rmailedit.el (autoload 'rmail-edit-current-message "rmailedit" "\ ------------------------------------------------------------ revno: 106392 committer: martin rudalics branch nick: trunk timestamp: Wed 2011-11-16 11:10:40 +0100 message: Rename window-nest to window-combination-limit. * window.h (window): Rename slot "nest" to "combination_limit". * window.c (Fwindow_nest): Rename to Fwindow_combination_limit. (Fset_window_nest): Rename to Fset_window_combination_limit. (Vwindow_nest): Rename to Vwindow_combination_limit. (recombine_windows, make_parent_window, make_window) (Fsplit_window_internal, saved_window) (Fset_window_configuration, save_window_save): Rename all occurrences of window_nest to window_combination_limit. * window.el (split-window, window-state-get-1) (window-state-put-1, window-state-put-2): Rename occurrences of window-nest to window-combination-limit. * cus-start.el (window-nest): Rename to window-combination-limit. * windows.texi (Resizing Windows, Splitting Windows): Rename occurrences of window-nest to window-combination-limit. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-11-14 21:00:24 +0000 +++ doc/lispref/ChangeLog 2011-11-16 10:10:40 +0000 @@ -1,3 +1,8 @@ +2011-11-16 Martin Rudalics + + * windows.texi (Resizing Windows, Splitting Windows): Rename + occurrences of window-nest to window-combination-limit. + 2011-11-14 Juanma Barranquero * intro.texi (Lisp History): Fix typo. === modified file 'doc/lispref/windows.texi' --- doc/lispref/windows.texi 2011-11-12 09:55:50 +0000 +++ doc/lispref/windows.texi 2011-11-16 10:10:40 +0000 @@ -632,11 +632,12 @@ The optional argument @var{ignore} has the same meaning as for the function @code{window-resizable} above. -The choice of which window edge this function alters depends on the -splitting and nesting status of the involved windows; in some cases, -it may alter both edges. @xref{Splitting Windows}. To resize by -moving only the bottom or right edge of a window, use the function -@code{adjust-window-trailing-edge}, below. +The choice of which window edges this function alters depends on the +values of the option @code{window-splits} and the combination-limit +status of the involved windows; in some cases, it may alter both edges. +@xref{Splitting Windows}. To resize by moving only the bottom or right +edge of a window, use the function @code{adjust-window-trailing-edge}, +below. @end defun @c The commands enlarge-window, enlarge-window-horizontally, @@ -859,8 +860,8 @@ deleting @var{window} will usually affect @emph{all} windows in @var{window}'s combination. -The setting of this variable has no effect if @code{window-nest} (see -below) is non-@code{nil}. +The setting of this variable has no effect if +@code{window-combination-limit} (see below) is non-@code{nil}. @end defopt To illustrate the use of @code{window-splits} consider the following @@ -931,34 +932,36 @@ @end group @end smallexample -@defopt window-nest +@defopt window-combination-limit If this variable is @code{nil}, @code{split-window} creates a new parent window if and only if the old window has no parent window or shall be split orthogonally to the combination it is part of. If this variable -is non-@code{nil}, @code{split-window} always creates a new parent -window. If this variable is always non-@code{nil}, a frame's window -tree is a binary tree so every window but the frame's root window has -exactly one sibling. +is @code{t}, @code{split-window} always creates a new parent window. If +this variable is always @code{t}, a frame's window tree is a binary tree +so every window but the frame's root window has exactly one sibling. +Other values are reserved for future use. -The value of this variable is also assigned to the nest status of the -new parent window. The nest status of any window can be retrieved via -the function @code{window-nest} and altered by the function -@code{set-window-nest}, see below. +The value of this variable is also assigned to the combination-limit +status of the new parent window. The combination-limit status of any +window can be retrieved via the function @code{window-combination-limit} +and altered by the function @code{set-window-combination-limit}, see +below. @end defopt -@defun window-nest &optional window -This function returns the nest status of @var{window}. The argument -@var{window} can be any window and defaults to the selected one. Note, -however, that the nest status is currently meaningful for internal -windows only. +@defun window-combination-limit &optional window +This function returns the combination-limit status of @var{window}. The +argument @var{window} can be any window and defaults to the selected +one. Note, however, that the combination-limit status is currently +meaningful for internal windows only. -@cindex nest status -The @dfn{nest status} of a window specifies whether that window may be -removed and its child windows recombined with that window's siblings -when such a sibling's child window is deleted. The nest status is -initially assigned by @code{split-window} from the current value of the -variable @code{window-nest} (see above) and can be reset by the function -@code{set-window-nest} (see below). +@cindex combination-limit status +The @dfn{combination-limit status} of a window specifies whether that +window may be removed and its child windows recombined with that +window's siblings when such a sibling's child window is deleted. The +combination-limit status is initially assigned by @code{split-window} +from the current value of the variable @code{window-combination-limit} +(see above) and can be reset by the function +@code{set-window-combination-limit} (see below). If the return value is @code{nil}, child windows of @var{window} may be recombined with @var{window}'s siblings when a window gets deleted. A @@ -966,16 +969,17 @@ never (re-)combined with @var{window}'s siblings in such a case. @end defun -@defun set-window-nest window &optional status -This functions sets the nest status (see above) of @var{window} to -@var{status}. The argument @var{window} can be any window and defaults -to the selected one. Note that setting the nest status is meaningful -for internal windows only. The return value is @var{status}. +@defun set-window-combination-limit window &optional status +This functions sets the combination-limit status (see above) of +@var{window} to @var{status}. The argument @var{window} can be any +window and defaults to the selected one. Note that setting the +combination-limit status is meaningful for internal windows only. The +return value is @var{status}. @end defun -To illustrate the use of @code{window-nest} consider the following -configuration (throughout the following examples we shall assume that -@code{window-splits} invariantly is @code{nil}). +To illustrate the use of @code{window-combination-limit} consider the +following configuration (throughout the following examples we shall +assume that @code{window-splits} invariantly is @code{nil}). @smallexample @group ______________________________________ @@ -997,7 +1001,8 @@ @end smallexample Splitting @code{W2} into two windows above each other with -@code{window-nest} equal @code{nil} will get you a configuration like: +@code{window-combination-limit} equal @code{nil} will get you a +configuration like: @smallexample @group ______________________________________ @@ -1064,9 +1069,9 @@ Hence, with respect to the initial configuration, window @code{W2} has grown at the expense of window @code{W3}. If, however, in the initial -configuration you had split @code{W2} with @code{window-nest} bound to -@code{t}, a new internal window @code{W5} would have been created as -depicted below. +configuration you had split @code{W2} with +@code{window-combination-limit} bound to @code{t}, a new internal window +@code{W5} would have been created as depicted below. @smallexample @group ______________________________________ === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-16 03:17:29 +0000 +++ lisp/ChangeLog 2011-11-16 10:10:40 +0000 @@ -1,3 +1,11 @@ +2011-11-16 Martin Rudalics + + * window.el (split-window, window-state-get-1) + (window-state-put-1, window-state-put-2): Rename occurrences of + window-nest to window-combination-limit. + * cus-start.el (window-nest): Rename to + window-combination-limit. + 2011-11-16 Chong Yidong * progmodes/autoconf.el (autoconf-mode): Fix comment-start-skip === modified file 'lisp/cus-start.el' --- lisp/cus-start.el 2011-10-07 02:17:29 +0000 +++ lisp/cus-start.el 2011-11-16 10:10:40 +0000 @@ -401,7 +401,7 @@ (const :tag "Only on ttys" :value tty) (other :tag "Always" t)) "23.1") (window-splits windows boolean "24.1") - (window-nest windows boolean "24.1") + (window-combination-limit windows boolean "24.1") ;; xdisp.c (show-trailing-whitespace whitespace-faces boolean nil :safe booleanp) === modified file 'lisp/window.el' --- lisp/window.el 2011-11-14 20:23:26 +0000 +++ lisp/window.el 2011-11-16 10:10:40 +0000 @@ -3083,9 +3083,9 @@ (parent (window-parent window)) (function (window-parameter window 'split-window)) (window-side (window-parameter window 'window-side)) - ;; Rebind `window-nest' since in some cases we may have to - ;; override its value. - (window-nest window-nest) + ;; Rebind `window-combination-limit' since in some cases we may + ;; have to override its value. + (window-combination-limit window-combination-limit) atom-root) (window--check frame) @@ -3109,15 +3109,15 @@ (or (not parent) (not (window-parameter parent 'window-side)))) ;; WINDOW is a side root window. To make sure that a new parent - ;; window gets created set `window-nest' to t. - (setq window-nest t)) + ;; window gets created set `window-combination-limit' to t. + (setq window-combination-limit t)) (when (and window-splits size (> size 0)) ;; If `window-splits' is non-nil and SIZE is a non-negative ;; integer, we cannot reasonably resize other windows. Rather - ;; bind `window-nest' to t to make sure that subsequent window - ;; deletions are handled correctly. - (setq window-nest t)) + ;; bind `window-combination-limit' to t to make sure that + ;; subsequent window deletions are handled correctly. + (setq window-combination-limit t)) (let* ((parent-size ;; `parent-size' is the size of WINDOW's parent, provided @@ -3126,7 +3126,7 @@ ;; `resize' non-nil means we are supposed to resize other ;; windows in WINDOW's combination. (resize - (and window-splits (not window-nest) + (and window-splits (not window-combination-limit) ;; Resize makes sense in iso-combinations only. (window-combined-p window horizontal))) ;; `old-size' is the current size of WINDOW. @@ -3206,7 +3206,8 @@ ;; Make new-parent non-nil if we need a new parent window; ;; either because we want to nest or because WINDOW is not ;; iso-combined. - (or window-nest (not (window-combined-p window horizontal)))) + (or window-combination-limit + (not (window-combined-p window horizontal)))) (setq new-normal ;; Make new-normal the normal size of the new window. (cond @@ -3584,7 +3585,7 @@ (total-width . ,(window-total-size window t)) (normal-height . ,(window-normal-size window)) (normal-width . ,(window-normal-size window t)) - (nest . ,(window-nest window)) + (combination-limit . ,(window-combination-limit window)) ,@(let (list) (dolist (parameter (window-parameters window)) (unless (memq (car parameter) @@ -3709,9 +3710,11 @@ window-safe-min-width))) (if (window-sizable-p window (- size) horizontal 'safe) - (let* ((window-nest (assq 'nest item))) - ;; We must inherit the nesting, otherwise we might mess - ;; up handling of atomic and side window. + (let* ((window-combination-limit + (assq 'combination-limit item))) + ;; We must inherit the combiantion limit, otherwise + ;; we might mess up handling of atomic and side + ;; window. (setq new (split-window window size horizontal))) ;; Give up if we can't resize window down to safe sizes. (error "Cannot resize window %s" window)) @@ -3735,10 +3738,11 @@ (dolist (item window-state-put-list) (let ((window (car item)) (splits (cdr (assq 'splits item))) - (nest (cdr (assq 'nest item))) + (combination-limit (cdr (assq 'combination-limit item))) (parameters (cdr (assq 'parameters item))) (state (cdr (assq 'buffer item)))) - (when nest (set-window-nest window nest)) + (when combination-limit + (set-window-combination-limit window combination-limit)) ;; Process parameters. (when parameters (dolist (parameter parameters) === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-15 17:37:37 +0000 +++ src/ChangeLog 2011-11-16 10:10:40 +0000 @@ -1,3 +1,14 @@ +2011-11-16 Martin Rudalics + + * window.h (window): Rename slot "nest" to "combination_limit". + * window.c (Fwindow_nest): Rename to Fwindow_combination_limit. + (Fset_window_nest): Rename to Fset_window_combination_limit. + (Vwindow_nest): Rename to Vwindow_combination_limit. + (recombine_windows, make_parent_window, make_window) + (Fsplit_window_internal, saved_window) + (Fset_window_configuration, save_window_save): Rename all + occurrences of window_nest to window_combination_limit. + 2011-11-15 Juanma Barranquero * image.c (imagemagick_load_image): Fix typo. === modified file 'src/window.c' --- src/window.c 2011-11-14 20:23:26 +0000 +++ src/window.c 2011-11-16 10:10:40 +0000 @@ -465,32 +465,33 @@ return decode_any_window (window)->prev; } -DEFUN ("window-nest", Fwindow_nest, Swindow_nest, 0, 1, 0, - doc: /* Return nest status of window WINDOW. +DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combination_limit, 0, 1, 0, + doc: /* Return combination limit of window WINDOW. If WINDOW is omitted or nil, it defaults to the selected window. If the return value is nil, child windows of WINDOW can be recombined with -WINDOW's siblings. A return value of non-nil means that child windows of +WINDOW's siblings. A return value of t means that child windows of WINDOW are never \(re-)combined with WINDOW's siblings. */) (Lisp_Object window) { - return decode_any_window (window)->nest; + return decode_any_window (window)->combination_limit; } -DEFUN ("set-window-nest", Fset_window_nest, Sset_window_nest, 2, 2, 0, - doc: /* Set nest status of window WINDOW to STATUS; return STATUS. +DEFUN ("set-window-combination-limit", Fset_window_combination_limit, Sset_window_combination_limit, 2, 2, 0, + doc: /* Set combination limit of window WINDOW to STATUS; return STATUS. If WINDOW is omitted or nil, it defaults to the selected window. -If STATUS is nil, child windows of WINDOW can be recombined with WINDOW's -siblings. STATUS non-nil means that child windows of WINDOW are never -\(re-)combined with WINDOW's siblings. */) +If STATUS is nil, child windows of WINDOW can be recombined with +WINDOW's siblings. STATUS t means that child windows of WINDOW are +never \(re-)combined with WINDOW's siblings. Other values are reserved +for future use. */) (Lisp_Object window, Lisp_Object status) { register struct window *w = decode_any_window (window); - w->nest = status; + w->combination_limit = status; - return w->nest; + return w->combination_limit; } DEFUN ("window-use-time", Fwindow_use_time, Swindow_use_time, 0, 1, 0, @@ -1879,7 +1880,7 @@ w = XWINDOW (window); parent = w->parent; - if (!NILP (parent) && NILP (w->nest)) + if (!NILP (parent) && NILP (w->combination_limit)) { p = XWINDOW (parent); if (((!NILP (p->vchild) && !NILP (w->vchild)) @@ -3248,7 +3249,7 @@ p->start = Qnil; p->pointm = Qnil; p->buffer = Qnil; - p->nest = Qnil; + p->combination_limit = Qnil; p->window_parameters = Qnil; } @@ -3295,7 +3296,7 @@ w->start_at_line_beg = w->display_table = w->dedicated = Qnil; w->base_line_number = w->base_line_pos = w->region_showing = Qnil; w->column_number_displayed = w->redisplay_end_trigger = Qnil; - w->nest = w->window_parameters = Qnil; + w->combination_limit = w->window_parameters = Qnil; w->prev_buffers = w->next_buffers = Qnil; /* Initialize non-Lisp data. */ w->desired_matrix = w->current_matrix = 0; @@ -3668,7 +3669,7 @@ int horflag /* HORFLAG is 1 when we split side-by-side, 0 otherwise. */ = EQ (side, Qt) || EQ (side, Qleft) || EQ (side, Qright); - int do_nest = 0; + int combination_limit = 0; CHECK_WINDOW (old); o = XWINDOW (old); @@ -3677,11 +3678,11 @@ CHECK_NUMBER (total_size); - /* Set do_nest to 1 if we have to make a new parent window. We do - that if either `window-nest' is non-nil, or OLD has no parent, or - OLD is ortho-combined. */ - do_nest = - !NILP (Vwindow_nest) + /* Set combination_limit to 1 if we have to make a new parent window. + We do that if either `window-combination-limit' is t, or OLD has no + parent, or OLD is ortho-combined. */ + combination_limit = + !NILP (Vwindow_combination_limit) || NILP (o->parent) || NILP (horflag ? (XWINDOW (o->parent)->hchild) @@ -3701,7 +3702,7 @@ error ("Attempt to split minibuffer window"); else if (XINT (total_size) < (horflag ? 2 : 1)) error ("Size of new window too small (after split)"); - else if (!do_nest && !NILP (Vwindow_splits)) + else if (!combination_limit && !NILP (Vwindow_splits)) /* `window-splits' non-nil means try to resize OLD's siblings proportionally. */ { @@ -3726,7 +3727,7 @@ } /* This is our point of no return. */ - if (do_nest) + if (combination_limit) { /* Save the old value of o->normal_cols/lines. It gets corrupted by make_parent_window and we need it below for assigning it to @@ -3735,8 +3736,9 @@ make_parent_window (old, horflag); p = XWINDOW (o->parent); - /* Store value of `window-nest' in new parent's nest slot. */ - p->nest = Vwindow_nest; + /* Store value of `window-combination-limit' in new parent's + combination_limit slot. */ + p->combination_limit = Vwindow_combination_limit; /* These get applied below. */ p->new_total = horflag ? o->total_cols : o->total_lines; p->new_normal = new_normal; @@ -3923,7 +3925,7 @@ /* Put SIBLING into PARENT's place. */ replace_window (parent, sibling, 0); /* Have SIBLING inherit the following three slot values from - PARENT (the nest slot is not inherited). */ + PARENT (the combination_limit slot is not inherited). */ s->normal_cols = p->normal_cols; s->normal_lines = p->normal_lines; /* Mark PARENT as deleted. */ @@ -5312,7 +5314,7 @@ Lisp_Object left_margin_cols, right_margin_cols; Lisp_Object left_fringe_width, right_fringe_width, fringes_outside_margins; Lisp_Object scroll_bar_width, vertical_scroll_bar_type, dedicated; - Lisp_Object nest, window_parameters; + Lisp_Object combination_limit, window_parameters; }; #define SAVED_WINDOW_N(swv,n) \ @@ -5543,7 +5545,7 @@ w->scroll_bar_width = p->scroll_bar_width; w->vertical_scroll_bar_type = p->vertical_scroll_bar_type; w->dedicated = p->dedicated; - w->nest = p->nest; + w->combination_limit = p->combination_limit; w->window_parameters = p->window_parameters; XSETFASTINT (w->last_modified, 0); XSETFASTINT (w->last_overlay_modified, 0); @@ -5821,7 +5823,7 @@ p->scroll_bar_width = w->scroll_bar_width; p->vertical_scroll_bar_type = w->vertical_scroll_bar_type; p->dedicated = w->dedicated; - p->nest = w->nest; + p->combination_limit = w->combination_limit; p->window_parameters = w->window_parameters; if (!NILP (w->buffer)) { @@ -6284,7 +6286,8 @@ and the like. This ignores a couple of things like the dedicatedness status of - window, nest and the like. This might have to be fixed. */ + window, combination_limit and the like. This might have to be + fixed. */ int compare_window_configurations (Lisp_Object configuration1, Lisp_Object configuration2, int ignore_positions) @@ -6496,24 +6499,27 @@ same combination. This also allows to split a window that is otherwise too small or of fixed size. -This variable takes no effect if `window-nest' is non-nil. */); +This variable takes no effect if `window-combination-limit' is non-nil. */); Vwindow_splits = Qnil; - DEFVAR_LISP ("window-nest", Vwindow_nest, + DEFVAR_LISP ("window-combination-limit", Vwindow_combination_limit, doc: /* Non-nil means splitting a window makes a new parent window. If this variable is nil, splitting a window will create a new parent window only if the window has no parent window or the window shall become a combination orthogonal to the one it it is part of. -If this variable is non-nil, splitting a window always creates a new -parent window. If all splits behave this way, each frame's window tree -is a binary tree and every window but the frame's root window has -exactly one sibling. - -The value of this variable is also assigned to the nest status of the -new parent window. The nest status of a window can be retrieved via the -function `window-nest' and altered by the function `set-window-nest'. */); - Vwindow_nest = Qnil; +If this variable is t, splitting a window always creates a new parent +window. If all splits behave this way, each frame's window tree is a +binary tree and every window but the frame's root window has exactly one +sibling. + +Other values are reserved for future use. + +The value of this variable is also assigned to the combination_limit +status of the new parent window. The combination-limit status of a +window can be retrieved via the function `window-combination-limit' and +altered by the function `set-window-combination-limit'. */); + Vwindow_combination_limit = Qnil; defsubr (&Sselected_window); defsubr (&Sminibuffer_window); @@ -6533,8 +6539,8 @@ defsubr (&Swindow_left_child); defsubr (&Swindow_next_sibling); defsubr (&Swindow_prev_sibling); - defsubr (&Swindow_nest); - defsubr (&Sset_window_nest); + defsubr (&Swindow_combination_limit); + defsubr (&Sset_window_combination_limit); defsubr (&Swindow_use_time); defsubr (&Swindow_top_line); defsubr (&Swindow_left_column); === modified file 'src/window.h' --- src/window.h 2011-11-12 09:55:50 +0000 +++ src/window.h 2011-11-16 10:10:40 +0000 @@ -258,9 +258,8 @@ must run the redisplay-end-trigger-hook. */ Lisp_Object redisplay_end_trigger; - /* Non-nil means this window's child windows are never - (re-)combined. */ - Lisp_Object nest; + /* t means this window's child windows are not (re-)combined. */ + Lisp_Object combination_limit; /* Alist of triples listing buffers previously shown in this window. */ ------------------------------------------------------------ revno: 106391 fixes bug(s): http://debbugs.gnu.org/10033 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-11-16 11:17:29 +0800 message: * autoconf.el (autoconf-mode): Fix comment-start-skip regexp. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-16 02:26:00 +0000 +++ lisp/ChangeLog 2011-11-16 03:17:29 +0000 @@ -1,3 +1,8 @@ +2011-11-16 Chong Yidong + + * progmodes/autoconf.el (autoconf-mode): Fix comment-start-skip + regexp (Bug#10033). + 2011-11-16 Stefan Monnier * tmm.el (tmm-prompt): Use minibuffer-with-setup-hook (bug#10053). === modified file 'lisp/emacs-lisp/eieio.el' --- lisp/emacs-lisp/eieio.el 2011-11-15 17:37:37 +0000 +++ lisp/emacs-lisp/eieio.el 2011-11-16 03:17:29 +0000 @@ -3051,7 +3051,7 @@ ;;;### (autoloads (eieio-help-mode-augmentation-maybee eieio-describe-generic ;;;;;; eieio-describe-constructor eieio-describe-class eieio-browse) -;;;;;; "eieio-opt" "eieio-opt.el" "1bed0a56310f402683419139ebc18d7f") +;;;;;; "eieio-opt" "eieio-opt.el" "4fb6625c3a007438aab4e8e77b6c73c2") ;;; Generated autoloads from eieio-opt.el (autoload 'eieio-browse "eieio-opt" "\ === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2011-11-15 11:23:14 +0000 +++ lisp/mail/rmail.el 2011-11-16 03:17:29 +0000 @@ -4494,27 +4494,29 @@ ;;;*** -;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "a79f498959deded8fa9d88a7dca93bc0") +;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "6296f0170a37670c49a88a1b92d78187") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ -Toggle displaying of a MIME message. +Toggle the display of a MIME message. The actual behavior depends on the value of `rmail-enable-mime'. -If `rmail-enable-mime' is non-nil (default), this command changes the -display of a MIME message between decoded presentation form and raw data. - -With ARG, toggle the display of the current MIME entity only. - -If `rmail-enable-mime' is nil, this creates a temporary -\"*RMAIL*\" buffer holding a decoded copy of the message. Inline -content-types are handled according to -`rmail-mime-media-type-handlers-alist'. By default, this -displays text and multipart messages, and offers to download -attachments as specified by `rmail-mime-attachment-dirs-alist'. - -\(fn &optional ARG)" t nil) +If `rmail-enable-mime' is non-nil (the default), this command toggles +the display of a MIME message between decoded presentation form and +raw data. With optional prefix argument ARG, it toggles the display only +of the MIME entity at point, if there is one. The optional argument +STATE forces a particular display state, rather than toggling. +`raw' forces raw mode, any other non-nil value forces decoded mode. + +If `rmail-enable-mime' is nil, this creates a temporary \"*RMAIL*\" +buffer holding a decoded copy of the message. Inline content-types are +handled according to `rmail-mime-media-type-handlers-alist'. +By default, this displays text and multipart messages, and offers to +download attachments as specified by `rmail-mime-attachment-dirs-alist'. +The arguments ARG and STATE have no effect in this case. + +\(fn &optional ARG STATE)" t nil) ;;;*** === modified file 'lisp/progmodes/autoconf.el' --- lisp/progmodes/autoconf.el 2011-01-26 08:36:39 +0000 +++ lisp/progmodes/autoconf.el 2011-11-16 03:17:29 +0000 @@ -83,7 +83,8 @@ (set (make-local-variable 'defun-prompt-regexp) "^[ \t]*A[CM]_\\(\\sw\\|\\s_\\)+") (set (make-local-variable 'comment-start) "dnl ") - (set (make-local-variable 'comment-start-skip) "\\(?:\\" (0 "<")))) (set (make-local-variable 'font-lock-defaults)