Now on revision 106747. ------------------------------------------------------------ revno: 106747 committer: Paul Eggert branch nick: trunk timestamp: Thu 2011-12-29 18:52:49 -0800 message: Spelling fixes. diff: === modified file 'doc/emacs/fortran-xtra.texi' --- doc/emacs/fortran-xtra.texi 2011-10-20 00:41:15 +0000 +++ doc/emacs/fortran-xtra.texi 2011-12-30 02:52:49 +0000 @@ -22,7 +22,7 @@ Customize @code{auto-mode-alist} to add more extensions. GNU Fortran supports both free and fixed form. This manual mainly documents Fortran mode, but the corresponding F90 mode features are mentioned when -revelant. +relevant. Fortran mode provides special motion commands for Fortran statements and subprograms, and indentation commands that understand Fortran === modified file 'doc/misc/calc.texi' --- doc/misc/calc.texi 2011-12-12 05:32:49 +0000 +++ doc/misc/calc.texi 2011-12-30 02:52:49 +0000 @@ -11100,7 +11100,7 @@ @texline @math{15\times 19\times 28 = 7980} years. @infoline 15*19*28 = 7980 years. This is the length of a Julian cycle. Working backwards, the previous -year in which all three cycles began was 4713 BC, and so Scalinger +year in which all three cycles began was 4713 BC, and so Scaliger chose that year as the beginning of a Julian cycle. Since at the time there were no historical records from before 4713 BC, using this year as a starting point had the advantage of avoiding negative year === modified file 'doc/misc/nxml-mode.texi' --- doc/misc/nxml-mode.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/nxml-mode.texi 2011-12-30 02:52:49 +0000 @@ -878,7 +878,7 @@ require XML parsers to read the DTD. With DTDs, it was impractical to get validation without using an external DTD or reference to an parameter entity. With RELAX NG and other schema languages, you can -simulataneously get the benefits of validation and standalone XML +simultaneously get the benefits of validation and standalone XML documents. Therefore, I recommend that you do not reference an external DOCTYPE in your XML documents. @@ -908,4 +908,3 @@ @end itemize @bye - === modified file 'doc/misc/reftex.texi' --- doc/misc/reftex.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/reftex.texi 2011-12-30 02:52:49 +0000 @@ -90,7 +90,7 @@ Nutshell}). You can go back later to other parts of this document when needed. -@insertcopying +@insertcopying @menu * Introduction:: Quick-Start information. @@ -157,7 +157,7 @@ * Citation Info:: View the corresponding database entry. * Chapterbib and Bibunits:: Multiple bibliographies in a Document. * Citations Outside LaTeX:: How to make citations in Emails etc. -* BibTeX Database Subsets:: Extract parts of a big database. +* BibTeX Database Subsets:: Extract parts of a big database. Index Support @@ -1672,7 +1672,7 @@ * Citation Info:: View the corresponding database entry. * Chapterbib and Bibunits:: Multiple bibliographies in a Document. * Citations Outside LaTeX:: How to make citations in Emails etc. -* BibTeX Database Subsets:: Extract parts of a big database. +* BibTeX Database Subsets:: Extract parts of a big database. @end menu @node Creating Citations, Citation Styles, , Citations @@ -1776,12 +1776,12 @@ @item e Create a new BibTeX database file which contains all @i{marked} entries in the selection buffer. If no entries are marked, all entries are -selected. +selected. @item E Create a new BibTeX database file which contains all @i{unmarked} entries in the selection buffer. If no entries are marked, all entries -are selected. +are selected. @item @key{TAB} Enter a citation key with completion. This may also be a key which does @@ -3215,7 +3215,7 @@ Before calling a @b{Ref@TeX{}} function, the style hook should always test for the availability of the function, so that the style file will -also work for people who do not use @b{Ref@TeX{}}. +also work for people who do not use @b{Ref@TeX{}}. Additions made with style files in the way described below remain local to the current document. For example, if one package uses AMSTeX, the @@ -3714,7 +3714,7 @@ Create a new BibTeX database file with all entries referenced in document. The command prompts for a filename and writes the collected entries to that file. Only entries referenced in the current document with -any @code{\cite}-like macros are used. +any @code{\cite}-like macros are used. The sequence in the new file is the same as it was in the old database. @end deffn @@ -3819,7 +3819,7 @@ ordinary TOC window), the automatic recentering is turned on. When the frame gets destroyed, automatic recentering is turned off again. -This feature can be turned on and off from the menu +This feature can be turned on and off from the menu (Ref->Options). @end defopt @@ -4095,7 +4095,7 @@ t @r{This means to trust any label prefixes found.} regexp @r{If a regexp, only prefixes matched by the regexp are trusted.} list @r{List of accepted prefixes, as strings. The colon is part of} - @r{the prefix, e.g. ("fn:" "eqn:" "item:").} + @r{the prefix, e.g. ("fn:" "eqn:" "item:").} nil @r{Never trust a label prefix.} @end example The only disadvantage of using this feature is that the label context @@ -5179,11 +5179,11 @@ @noindent @b{Version 4.24} @itemize @bullet -@item +@item Inserting citation commands now prompts for optional arguments when called with a prefix argument. Related new options are @code{reftex-cite-prompt-optional-args} and -@code{reftex-cite-cleanup-optional-args}. +@code{reftex-cite-cleanup-optional-args}. @item New option @code{reftex-trust-label-prefix}. Configure this variable if you'd like RefTeX to base its classification of labels on prefixes. @@ -5199,7 +5199,7 @@ @noindent @b{Version 4.22} @itemize @bullet -@item +@item New command @code{reftex-create-bibtex-file} to create a new database with all entries referenced in the current document. @item @@ -5209,7 +5209,7 @@ @noindent @b{Version 4.21} @itemize @bullet -@item +@item Renaming labels from the toc buffer with key @kbd{M-%}. @end itemize @@ -5342,7 +5342,7 @@ @item Environments like theorems can be placed into the TOC by putting entries for @samp{"begin@{theorem@}"} in -@code{reftex-setion-levels}. +@code{reftex-section-levels}. @end itemize @noindent @b{Version 4.06} @@ -5425,7 +5425,7 @@ document, all labels and associated context. New keys @kbd{i}, @kbd{l}, and @kbd{c}. New options @code{reftex-toc-include-labels}, @code{reftex-toc-include-context}, -@code{reftex-toc-include-file-boundaries}. +@code{reftex-toc-include-file-boundaries}. @end itemize @noindent @b{Version 3.41} === modified file 'etc/NEWS.19' --- etc/NEWS.19 2011-12-19 06:21:24 +0000 +++ etc/NEWS.19 2011-12-30 02:52:49 +0000 @@ -5032,7 +5032,7 @@ ** If you call `get-buffer-window' passing t as its second argument, it will only search for windows on visible frames. Previously, passing t -as the secord argument caused `get-buffer-window' to search all +as the second argument caused `get-buffer-window' to search all frames, visible or not. ** If you call `other-buffer' with a nil or omitted second argument, it === modified file 'etc/NEWS.22' --- etc/NEWS.22 2011-12-15 07:24:10 +0000 +++ etc/NEWS.22 2011-12-30 02:52:49 +0000 @@ -3035,7 +3035,7 @@ ** Fortran mode changes *** F90 mode and Fortran mode have support for `hs-minor-mode' (hideshow). -It cannot deal with every code format, but ought to handle a sizeable +It cannot deal with every code format, but ought to handle a sizable majority. *** F90 mode and Fortran mode have new navigation commands === modified file 'lib-src/ebrowse.c' --- lib-src/ebrowse.c 2011-09-09 01:06:52 +0000 +++ lib-src/ebrowse.c 2011-12-30 02:52:49 +0000 @@ -981,7 +981,7 @@ } -/* Find the symbol for namespace NAME. If not found, retrun NULL */ +/* Find the symbol for namespace NAME. If not found, return NULL */ static struct sym * check_namespace (char *name, struct sym *context) === modified file 'lisp/ChangeLog.7' --- lisp/ChangeLog.7 2011-12-12 05:32:49 +0000 +++ lisp/ChangeLog.7 2011-12-30 02:52:49 +0000 @@ -13739,7 +13739,7 @@ (isearch-toggle-specified-input-method): Set the above variables. (isearch-toggle-input-method): Likewise. (isearch-process-search-multibyte-characters): Give - iseach-input-method as arg to read-multilingual-string. + isearch-input-method as arg to read-multilingual-string. * international/mule-cmds.el (read-multilingual-string): Adjusted for the previous change of variables related to input methods. === modified file 'lisp/allout-widgets.el' --- lisp/allout-widgets.el 2011-12-05 08:55:25 +0000 +++ lisp/allout-widgets.el 2011-12-30 02:52:49 +0000 @@ -1635,7 +1635,7 @@ situation with respect to siblings, parent, and offspring is unchanged from its last decoration. Use `allout-decorate-item-and-context' instead to reassess and adjust -relevent context, when suitable." +relevant context, when suitable." (if (not (equal (widget-get item-widget :last-decorated-tick) allout-command-counter)) (let ((was-modified (buffer-modified-p)) === modified file 'lisp/cedet/semantic/lex-spp.el' --- lisp/cedet/semantic/lex-spp.el 2011-11-24 01:58:14 +0000 +++ lisp/cedet/semantic/lex-spp.el 2011-12-30 02:52:49 +0000 @@ -577,7 +577,7 @@ (cond ;; CASE 3: Merge symbols together. ((eq (semantic-lex-token-class v) 'spp-symbol-merge) - ;; We need to merge the tokens in the 'text segement together, + ;; We need to merge the tokens in the 'text segment together, ;; and produce a single symbol from it. (let ((newsym (mapconcat (lambda (tok) === modified file 'lisp/emacs-lisp/avl-tree.el' --- lisp/emacs-lisp/avl-tree.el 2011-11-25 13:26:30 +0000 +++ lisp/emacs-lisp/avl-tree.el 2011-12-30 02:52:49 +0000 @@ -31,7 +31,7 @@ ;; deleting, and retrieving data from an AVL tree containing n elements ;; is O(log n). It is somewhat more rigidly balanced than other ;; self-balancing binary trees (such as red-black trees and AA trees), -;; making insertion slighty slower, deletion somewhat slower, and +;; making insertion slightly slower, deletion somewhat slower, and ;; retrieval somewhat faster (the asymptotic scaling is of course the ;; same for all types). Thus it may be a good choice when the tree will ;; be relatively static, i.e. data will be retrieved more often than === modified file 'lisp/emacs-lisp/bytecomp.el' --- lisp/emacs-lisp/bytecomp.el 2011-12-19 06:21:24 +0000 +++ lisp/emacs-lisp/bytecomp.el 2011-12-30 02:52:49 +0000 @@ -3725,7 +3725,7 @@ (defun byte-compile-if (form) (byte-compile-form (car (cdr form))) ;; Check whether we have `(if (fboundp ...' or `(if (boundp ...' - ;; and avoid warnings about the relevent symbols in the consequent. + ;; and avoid warnings about the relevant symbols in the consequent. (let ((clause (nth 1 form)) (donetag (byte-compile-make-tag))) (if (null (nthcdr 3 form)) === modified file 'lisp/frame.el' --- lisp/frame.el 2011-11-29 06:07:51 +0000 +++ lisp/frame.el 2011-12-30 02:52:49 +0000 @@ -396,7 +396,7 @@ ;; Finally, get rid of the old frame. (delete-frame frame-initial-frame t)) - ;; Otherwise, we don't need all that rigamarole; just apply + ;; Otherwise, we don't need all that rigmarole; just apply ;; the new parameters. (let (newparms allparms tail) (setq allparms (append initial-frame-alist === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-12-28 02:40:35 +0000 +++ lisp/gnus/ChangeLog 2011-12-30 02:52:49 +0000 @@ -4713,7 +4713,7 @@ 2010-10-24 Lars Magne Ingebrigtsen * nnimap.el (nnimap-request-head): New function. - (nnimap-request-move-article): Try to be slighly faster by not + (nnimap-request-move-article): Try to be slightly faster by not requesting the entire message when moving. (nnimap-transform-headers): Don't bug out on bodiless articles. (nnimap-send-command): Have no outstanding messages if the IMAP server === modified file 'lisp/gnus/gnus-agent.el' --- lisp/gnus/gnus-agent.el 2011-11-20 02:29:42 +0000 +++ lisp/gnus/gnus-agent.el 2011-12-30 02:52:49 +0000 @@ -4031,7 +4031,7 @@ ;; gnus-agent-regenerate-group can remove the article ID of every ;; article (with the exception of the last ID in the list - it's ;; special) that no longer appears in the overview. In this - ;; situtation, the last article ID in the list implies that it, + ;; situation, the last article ID in the list implies that it, ;; and every article ID preceding it, have been fetched from the ;; server. === modified file 'lisp/gnus/gnus-int.el' --- lisp/gnus/gnus-int.el 2011-09-12 02:15:11 +0000 +++ lisp/gnus/gnus-int.el 2011-12-30 02:52:49 +0000 @@ -356,7 +356,7 @@ infos data)) (defun gnus-retrieve-group-data-early (gnus-command-method infos) - "Start early async retrival of data from GNUS-COMMAND-METHOD." + "Start early async retrieval of data from GNUS-COMMAND-METHOD." (when (stringp gnus-command-method) (setq gnus-command-method (gnus-server-to-method gnus-command-method))) (funcall (gnus-get-function gnus-command-method 'retrieve-group-data-early) === modified file 'lisp/gnus/mm-util.el' --- lisp/gnus/mm-util.el 2011-11-20 03:48:53 +0000 +++ lisp/gnus/mm-util.el 2011-12-30 02:52:49 +0000 @@ -424,7 +424,7 @@ ;; Cf. http://thread.gmane.org/v9lkng5nwy.fsf@marauder.physik.uni-ulm.de "List of IBM codepage numbers. -The codepage mappings slighly differ between IBM and other vendors. +The codepage mappings slightly differ between IBM and other vendors. See \"ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/IBM/README.TXT\". If an element is a number corresponding to a supported windows === modified file 'lisp/gnus/nndiary.el' --- lisp/gnus/nndiary.el 2011-12-21 09:58:39 +0000 +++ lisp/gnus/nndiary.el 2011-12-30 02:52:49 +0000 @@ -71,7 +71,7 @@ ;; * nndiary-get-new-mail, nndiary-mail-source and nndiary-split-methods: ;; NNDiary has some experimental parts, in the sense Gnus normally uses only -;; one mail back ends for mail retreival and splitting. This back end is +;; one mail back ends for mail retrieval and splitting. This back end is ;; also an attempt to make it behave differently. For Gnus developers: as ;; you can see if you snarf into the code, that was not a very difficult ;; thing to do. Something should be done about the respooling breakage @@ -224,7 +224,7 @@ (defvoo nndiary-get-new-mail nil "Whether nndiary gets new mail and split it. Contrary to traditional mail back ends, this variable can be set to t -even if your primary mail back end also retreives mail. In such a case, +even if your primary mail back end also retrieves mail. In such a case, NDiary uses its own mail-sources and split-methods.") (defvoo nndiary-nov-is-evil nil === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2011-12-04 08:02:42 +0000 +++ lisp/gnus/nnir.el 2011-12-30 02:52:49 +0000 @@ -304,7 +304,7 @@ ;;; User Customizable Variables: (defgroup nnir nil - "Search groups in Gnus with assorted seach engines." + "Search groups in Gnus with assorted search engines." :group 'gnus) (defcustom nnir-ignored-newsgroups "" === modified file 'lisp/language/english.el' --- lisp/language/english.el 2011-01-26 08:36:39 +0000 +++ lisp/language/english.el 2011-12-30 02:52:49 +0000 @@ -30,7 +30,7 @@ ;; We need nothing special to support English on Emacs. Selecting ;; English as a language environment is one of the ways to reset -;; various multilingual environment to the original settting. +;; various multilingual environment to the original setting. ;;; Code: === modified file 'lisp/mh-e/mh-e.el' --- lisp/mh-e/mh-e.el 2011-11-20 20:31:38 +0000 +++ lisp/mh-e/mh-e.el 2011-12-30 02:52:49 +0000 @@ -342,7 +342,7 @@ "Non-nil means that we have \"flists\".") (defvar mh-index-data-file ".mhe_index" - "MH-E specific file where index seach info is stored.") + "MH-E specific file where index search info is stored.") (defvar mh-letter-header-field-regexp "^\\([A-Za-z][A-Za-z0-9-]*\\):") === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2011-11-19 09:18:31 +0000 +++ lisp/minibuffer.el 2011-12-30 02:52:49 +0000 @@ -2672,7 +2672,7 @@ mergedpat)) ;; New pos from the start. (newpos (length (completion-pcm--pattern->string pointpat))) - ;; Do it afterwards because it changes `pointpat' by sideeffect. + ;; Do it afterwards because it changes `pointpat' by side effect. (merged (completion-pcm--pattern->string (nreverse mergedpat)))) (setq suffix (completion--merge-suffix merged newpos suffix)) === modified file 'lisp/nxml/rng-valid.el' --- lisp/nxml/rng-valid.el 2011-12-04 08:02:42 +0000 +++ lisp/nxml/rng-valid.el 2011-12-30 02:52:49 +0000 @@ -570,7 +570,7 @@ (rng-clear-cached-state remove-start (1- pos))) ;; sync up with cached validation state (setq continue nil) - ;; do this before settting rng-validate-up-to-date-end + ;; do this before setting rng-validate-up-to-date-end ;; in case we get a quit (rng-mark-xmltok-errors) (rng-mark-xmltok-dependent-regions) === modified file 'lisp/obsolete/pgg-parse.el' --- lisp/obsolete/pgg-parse.el 2011-01-25 04:08:28 +0000 +++ lisp/obsolete/pgg-parse.el 2011-12-30 02:52:49 +0000 @@ -53,7 +53,7 @@ (defcustom pgg-parse-symmetric-key-algorithm-alist '((1 . IDEA) (2 . 3DES) (4 . CAST5) (5 . SAFER-SK128)) - "Alist of the assigned number to the simmetric key algorithm." + "Alist of the assigned number to the symmetric key algorithm." :group 'pgg-parse :type '(repeat (cons (sexp :tag "Number") (sexp :tag "Type")))) === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2011-12-12 05:32:49 +0000 +++ lisp/org/ChangeLog 2011-12-30 02:52:49 +0000 @@ -322,7 +322,7 @@ 2011-07-28 Nicolas Goaziou * org-capture.el (org-capture): If no file is associated to - current buffer, check dired buffer and try to retreive a possibly + current buffer, check dired buffer and try to retrieve a possibly directory associated. 2011-07-28 Eric Schulte @@ -948,7 +948,7 @@ 2011-07-28 Nicolas Goaziou * org-latex.el (org-export-latex-preprocess): Rely on - `org-export-footnotes-markers' to retreive definition of the + `org-export-footnotes-markers' to retrieve definition of the current footnote during export. 2011-07-28 Nicolas Goaziou === modified file 'lisp/org/ob-latex.el' --- lisp/org/ob-latex.el 2011-08-18 20:41:06 +0000 +++ lisp/org/ob-latex.el 2011-12-30 02:52:49 +0000 @@ -171,7 +171,7 @@ pdffile))) (defun org-babel-prep-session:latex (session params) - "Return an error because LaTeX doesn't support sesstions." + "Return an error because LaTeX doesn't support sessions." (error "LaTeX does not support sessions")) (provide 'ob-latex) === modified file 'lisp/org/org-exp.el' --- lisp/org/org-exp.el 2011-11-19 09:18:31 +0000 +++ lisp/org/org-exp.el 2011-12-30 02:52:49 +0000 @@ -2290,7 +2290,7 @@ (plist-get org-export-opt-plist (intern (concat ":" key))))) (save-match-data - ;; If arguments are provided, first retreive them properly + ;; If arguments are provided, first retrieve them properly ;; (in ARGS, as a list), then replace them in VAL. (when args (setq args (org-split-string args ",") args2 nil) === modified file 'lisp/play/dunnet.el' --- lisp/play/dunnet.el 2011-01-25 04:08:28 +0000 +++ lisp/play/dunnet.el 2011-12-30 02:52:49 +0000 @@ -2183,7 +2183,7 @@ nil nil nil nil nil (list obj-box) ;; stair-landing nil nil nil - (list obj-axe) ;; smal-crawlspace + (list obj-axe) ;; small-crawlspace nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil (list obj-special) ;; fourth-vermont-intersection === modified file 'lisp/progmodes/cc-engine.el' --- lisp/progmodes/cc-engine.el 2011-12-13 18:47:08 +0000 +++ lisp/progmodes/cc-engine.el 2011-12-30 02:52:49 +0000 @@ -2153,14 +2153,14 @@ (if (> pos c-state-nonlit-pos-cache-limit) (setq c-state-nonlit-pos-cache-limit pos)) pos)))) - + (defun c-state-literal-at (here) ;; If position HERE is inside a literal, return (START . END), the ;; boundaries of the literal (which may be outside the accessible bit of the ;; buffer). Otherwise, return nil. ;; ;; This function is almost the same as `c-literal-limits'. Previously, it - ;; differed in that it was a lower level function, and that it rigourously + ;; differed in that it was a lower level function, and that it rigorously ;; followed the syntax from BOB. `c-literal-limits' is now (2011-12) ;; virtually identical to this function. (save-restriction === modified file 'lisp/progmodes/cc-mode.el' --- lisp/progmodes/cc-mode.el 2011-12-24 19:32:31 +0000 +++ lisp/progmodes/cc-mode.el 2011-12-30 02:52:49 +0000 @@ -1102,7 +1102,7 @@ ;; nested. ;; ;; This function is called indirectly from font locking stuff - either from - ;; c-after-change (to prepare for after-change font-lockng) or from font + ;; c-after-change (to prepare for after-change font-locking) or from font ;; lock context (etc.) fontification. (let ((lit-limits (c-literal-limits)) (new-pos pos) @@ -1165,7 +1165,7 @@ ;; ;; ;; void myfunc(T* p) {} - ;; + ;; ;; Type a space in the first blank line, and the fontification of the next ;; line was fouled up by context fontification. (let ((new-beg beg) (new-end end) new-region) @@ -1180,10 +1180,10 @@ c-before-context-fontification-functions)))) (funcall c-standard-font-lock-fontify-region-function new-beg new-end verbose))) - + (defun c-after-font-lock-init () ;; Put on `font-lock-mode-hook'. This function ensures our after-change - ;; function will get excuted before the font-lock one. Amongst other + ;; function will get executed before the font-lock one. Amongst other ;; things. (remove-hook 'after-change-functions 'c-after-change t) (add-hook 'after-change-functions 'c-after-change nil t) === modified file 'lisp/progmodes/idlwave.el' --- lisp/progmodes/idlwave.el 2011-12-15 07:24:10 +0000 +++ lisp/progmodes/idlwave.el 2011-12-30 02:52:49 +0000 @@ -7855,7 +7855,7 @@ If point is on a keyword, help for that keyword will be shown. If point is on a routine name or in the argument list of a routine, help for that routine will be displayed. Works for system routines and -keywords, it pulls up text help. For other routies and keywords, +keywords, it pulls up text help. For other routines and keywords, visits the source file, finding help in the header (if `idlwave-help-source-try-header' is non-nil) or the routine definition itself." === modified file 'lisp/progmodes/prolog.el' --- lisp/progmodes/prolog.el 2011-12-17 06:51:13 +0000 +++ lisp/progmodes/prolog.el 2011-12-30 02:52:49 +0000 @@ -3262,7 +3262,7 @@ (defun prolog-clause-start (&optional not-allow-methods) "Return the position at the start of the head of the current clause. If NOTALLOWMETHODS is non-nil then do not match on methods in -objects (relevent only if 'prolog-system' is set to 'sicstus)." +objects (relevant only if 'prolog-system' is set to 'sicstus)." (save-excursion (let ((notdone t) (retval (point-min))) @@ -3328,7 +3328,7 @@ (defun prolog-clause-end (&optional not-allow-methods) "Return the position at the end of the current clause. If NOTALLOWMETHODS is non-nil then do not match on methods in -objects (relevent only if 'prolog-system' is set to 'sicstus)." +objects (relevant only if 'prolog-system' is set to 'sicstus)." (save-excursion (beginning-of-line) ; Necessary since we use "^...." for the search. (if (re-search-forward === modified file 'lisp/speedbar.el' --- lisp/speedbar.el 2011-12-09 19:54:01 +0000 +++ lisp/speedbar.el 2011-12-30 02:52:49 +0000 @@ -3063,7 +3063,7 @@ (let* ((speedbar-frame (speedbar-current-frame)) (fn (get-text-property (point) 'speedbar-function)) (tok (get-text-property (point) 'speedbar-token)) - ;; The 1-,+ is safe because scaning starts AFTER the point + ;; The 1-,+ is safe because scanning starts AFTER the point ;; specified. This lets the search include the character the ;; cursor is on. (tp (previous-single-property-change === modified file 'lisp/textmodes/bibtex.el' --- lisp/textmodes/bibtex.el 2011-11-24 01:58:14 +0000 +++ lisp/textmodes/bibtex.el 2011-12-30 02:52:49 +0000 @@ -5140,7 +5140,7 @@ (message "No URL known.")) url))) -;; We could combine multiple seach results with set operations +;; We could combine multiple search results with set operations ;; AND, OR, MINUS, and NOT. Would this be useful? ;; How complicated are searches in real life? ;; We could also have other searches such as "publication year newer than...". === modified file 'lisp/textmodes/reftex-vars.el' --- lisp/textmodes/reftex-vars.el 2011-01-25 04:08:28 +0000 +++ lisp/textmodes/reftex-vars.el 2011-12-30 02:52:49 +0000 @@ -1750,7 +1750,7 @@ (defcustom reftex-highlight-selection 'cursor "*Non-nil mean, highlight selected text in selection and *toc* buffers. Normally, the text near the cursor is the selected text, and it is -highlighted. This is the entry most keys in the selction and *toc* +highlighted. This is the entry most keys in the selection and *toc* buffers act on. However, if you mainly use the mouse to select an item, you may find it nice to have mouse-triggered highlighting instead or as well. The variable may have one of these values: === modified file 'lisp/textmodes/rst.el' --- lisp/textmodes/rst.el 2011-12-19 06:21:24 +0000 +++ lisp/textmodes/rst.el 2011-12-30 02:52:49 +0000 @@ -2348,7 +2348,7 @@ )) (defun rst-shift-region-right (pfxarg) - "Indent region ridigly, by a few characters to the right. + "Indent region rigidly, by a few characters to the right. This function first computes all possible alignment columns by inspecting the lines preceding the region for bulleted or enumerated list items. If the leftmost column is beyond the === modified file 'lisp/vc/vc-cvs.el' --- lisp/vc/vc-cvs.el 2011-11-24 08:21:03 +0000 +++ lisp/vc/vc-cvs.el 2011-12-30 02:52:49 +0000 @@ -319,7 +319,7 @@ (unless (or (not rev) (vc-cvs-valid-revision-number-p rev)) (if (not (vc-cvs-valid-symbolic-tag-name-p rev)) (error "%s is not a valid symbolic tag name" rev) - ;; If the input revison is a valid symbolic tag name, we create it + ;; If the input revision is a valid symbolic tag name, we create it ;; as a branch, commit and switch to it. (apply 'vc-cvs-command nil 0 files "tag" "-b" (list rev)) (apply 'vc-cvs-command nil 0 files "update" "-r" (list rev)) === modified file 'lisp/vc/vc-mtn.el' --- lisp/vc/vc-mtn.el 2011-11-24 08:21:03 +0000 +++ lisp/vc/vc-mtn.el 2011-12-30 02:52:49 +0000 @@ -193,7 +193,7 @@ (unless contents-done (vc-mtn-command nil 0 file "revert"))) -;; (defun vc-mtn-roolback (files) +;; (defun vc-mtn-rollback (files) ;; ) (defun vc-mtn-print-log (files buffer &optional shortlog start-revision limit) === modified file 'src/bidi.c' --- src/bidi.c 2011-11-20 03:48:53 +0000 +++ src/bidi.c 2011-12-30 02:52:49 +0000 @@ -1132,7 +1132,7 @@ Note that this function gives the paragraph separator the same direction as the preceding paragraph, even though Emacs generally - views the separartor as not belonging to any paragraph. */ + views the separator as not belonging to any paragraph. */ void bidi_paragraph_init (bidi_dir_t dir, struct bidi_it *bidi_it, int no_default_p) { === modified file 'src/fns.c' --- src/fns.c 2011-11-19 09:18:31 +0000 +++ src/fns.c 2011-12-30 02:52:49 +0000 @@ -3254,7 +3254,7 @@ /* Base64-decode the data at FROM of LENGTH bytes into TO. If MULTIBYTE is nonzero, the decoded result should be in multibyte - form. If NCHARS_RETRUN is not NULL, store the number of produced + form. If NCHARS_RETURN is not NULL, store the number of produced characters in *NCHARS_RETURN. */ static EMACS_INT === modified file 'src/font.h' --- src/font.h 2011-12-15 07:24:10 +0000 +++ src/font.h 2011-12-30 02:52:49 +0000 @@ -506,7 +506,7 @@ Lisp_Object type; /* 1 iff the font's foundry, family, and adstyle names are case - sensitve. */ + sensitive. */ int case_sensitive; /* Return a cache of font-entities on frame F. The cache must be a === modified file 'src/process.c' --- src/process.c 2011-12-06 08:17:35 +0000 +++ src/process.c 2011-12-30 02:52:49 +0000 @@ -3492,7 +3492,7 @@ || (NILP (buffer) && NILP (BVAR (&buffer_defaults, enable_multibyte_characters)))) /* We dare not decode end-of-line format by setting VAL to Qraw_text, because the existing Emacs Lisp libraries - assume that they receive bare code including a sequene of + assume that they receive bare code including a sequence of CR LF. */ val = Qnil; else === modified file 'src/search.c' --- src/search.c 2011-12-02 10:19:49 +0000 +++ src/search.c 2011-12-30 02:52:49 +0000 @@ -1302,7 +1302,7 @@ checking if we can use boyer-moore search. If TRT is non-nil, we can use boyer-moore search only if TRT can be represented by the byte array of 256 elements. For that, - all non-ASCII case-equivalents of all case-senstive + all non-ASCII case-equivalents of all case-sensitive characters in STRING must belong to the same charset and row. */ === modified file 'src/w32term.c' --- src/w32term.c 2011-12-19 06:21:24 +0000 +++ src/w32term.c 2011-12-30 02:52:49 +0000 @@ -3388,7 +3388,7 @@ if (whole) { /* Position scroll bar at rock bottom if the bottom of the - buffer is visible. This avoids shinking the thumb away + buffer is visible. This avoids shrinking the thumb away to nothing if it is held at the bottom of the buffer. */ if (position + portion >= whole && !draggingp) { === modified file 'src/xdisp.c' --- src/xdisp.c 2011-12-23 14:51:51 +0000 +++ src/xdisp.c 2011-12-30 02:52:49 +0000 @@ -13645,7 +13645,7 @@ /* Non-zero means we've seen at least one glyph that came from a display string. */ int string_seen = 0; - /* Largest and smalles buffer positions seen so far during scan of + /* Largest and smallest buffer positions seen so far during scan of glyph row. */ EMACS_INT bpos_max = pos_before; EMACS_INT bpos_min = pos_after; ------------------------------------------------------------ revno: 106746 committer: Juanma Barranquero branch nick: trunk timestamp: Thu 2011-12-29 19:08:46 +0100 message: doc/lispref/frames.texi (Font and Color Parameters): Add @pxref. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-12-29 16:20:26 +0000 +++ doc/lispref/ChangeLog 2011-12-29 18:08:46 +0000 @@ -1,3 +1,7 @@ +2011-12-29 Juanma Barranquero + + * frames.texi (Font and Color Parameters): Add @pxref. + 2011-12-29 Daniel Colascione * frames.texi (Font and Color Parameters): === modified file 'doc/lispref/frames.texi' --- doc/lispref/frames.texi 2011-12-29 16:20:26 +0000 +++ doc/lispref/frames.texi 2011-12-29 18:08:46 +0000 @@ -888,11 +888,11 @@ A list of symbols, specifying the @dfn{font backends} to use for drawing fonts in the frame, in order of priority. On X, there are currently two available font backends: @code{x} (the X core font -driver) and @code{xft} (the Xft font driver). On Windows, there -are currently two available font backends: @code{gdi} and -@code{uniscribe}. On other systems, there is only one available -font backend, so it does not make sense to modify this frame -parameter. +driver) and @code{xft} (the Xft font driver). On Windows, there are +currently two available font backends: @code{gdi} and +@code{uniscribe} (@pxref{Windows Fonts,,, emacs, The GNU Emacs +Manual}). On other systems, there is only one available font backend, +so it does not make sense to modify this frame parameter. @vindex background-mode, a frame parameter @item background-mode ------------------------------------------------------------ revno: 106745 fixes bug(s): http://debbugs.gnu.org/10399 author: Daniel Colascione committer: Juanma Barranquero branch nick: trunk timestamp: Thu 2011-12-29 17:20:26 +0100 message: doc/lispref/frames.texi: Document w32 font backends (bug#10399). diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-12-28 06:59:21 +0000 +++ doc/lispref/ChangeLog 2011-12-29 16:20:26 +0000 @@ -1,3 +1,8 @@ +2011-12-29 Daniel Colascione + + * frames.texi (Font and Color Parameters): + Document w32 font backends (bug#10399). + 2011-12-28 Paul Eggert * files.texi (File Attributes, Changing Files): === modified file 'doc/lispref/frames.texi' --- doc/lispref/frames.texi 2011-11-20 02:29:42 +0000 +++ doc/lispref/frames.texi 2011-12-29 16:20:26 +0000 @@ -888,9 +888,11 @@ A list of symbols, specifying the @dfn{font backends} to use for drawing fonts in the frame, in order of priority. On X, there are currently two available font backends: @code{x} (the X core font -driver) and @code{xft} (the Xft font driver). On other systems, there -is only one available font backend, so it does not make sense to -modify this frame parameter. +driver) and @code{xft} (the Xft font driver). On Windows, there +are currently two available font backends: @code{gdi} and +@code{uniscribe}. On other systems, there is only one available +font backend, so it does not make sense to modify this frame +parameter. @vindex background-mode, a frame parameter @item background-mode ------------------------------------------------------------ revno: 106744 committer: Chong Yidong branch nick: trunk timestamp: Thu 2011-12-29 23:58:42 +0800 message: Cleanups for the new Org section in the Emacs manual. * doc/emacs/text.texi (Org Mode): Copyedits. Refer to Outline Format for example. Add index entries. (Org Organizer, Org Authoring): Nodes renamed. Copyedits. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-12-26 10:36:41 +0000 +++ doc/emacs/ChangeLog 2011-12-29 15:58:42 +0000 @@ -1,3 +1,9 @@ +2011-12-29 Chong Yidong + + * text.texi (Org Mode): Copyedits. Refer to Outline Format for + example. Add index entries. + (Org Organizer, Org Authoring): Nodes renamed. Copyedits. + 2011-12-26 Chong Yidong * dired.texi (Dired Enter, Misc Dired Features): Document === modified file 'doc/emacs/emacs.texi' --- doc/emacs/emacs.texi 2011-12-25 14:16:00 +0000 +++ doc/emacs/emacs.texi 2011-12-29 15:58:42 +0000 @@ -548,6 +548,7 @@ * Case:: Changing the case of text. * Text Mode:: The major modes for editing text files. * Outline Mode:: Editing outlines. +* Org Mode:: The Emacs organizer. * TeX Mode:: Editing input to the formatter TeX. * HTML Mode:: Editing HTML and SGML files. * Nroff Mode:: Editing input to the formatter nroff. === modified file 'doc/emacs/text.texi' --- doc/emacs/text.texi 2011-12-21 14:02:38 +0000 +++ doc/emacs/text.texi 2011-12-29 15:58:42 +0000 @@ -1256,117 +1256,139 @@ @node Org Mode @section Org Mode -@kindex TAB @r{(Org Mode)} -@kindex S-TAB @r{(Org Mode)} @cindex organizer @cindex planner +@findex Org mode +@findex mode, Org + @findex org-mode -@cindex fold -@cindex headline + Org mode is a variant of Outline mode for using Emacs as an +organizer and/or authoring system. Files with names ending in the +extension @file{.org} are opened in Org mode (@pxref{Choosing Modes}). +To explicitly switch to Org mode, type @kbd{M-x org-mode}. + + In Org mode, as in Outline mode, each entry has a heading line that +starts with one or more @samp{*} characters. @xref{Outline Format}. +In addition, any line that begins with the @samp{#} character is +treated as a comment. + +@kindex TAB @r{(Org Mode)} +@findex org-cycle + Org mode provides commands for easily viewing and manipulating the +outline structure. The simplest of these commands is @key{TAB} +(@code{org-cycle}). If invoked on a heading line, it cycles through +the different visibility states of the subtree: (i) showing only that +heading line, (ii) showing only the heading line and the heading lines +of its direct children, if any, and (iii) showing the entire subtree. +If invoked in a body line, the global binding for @key{TAB} is +executed. + +@kindex S-TAB @r{(Org Mode)} +@findex org-shifttab + Typing @key{S-TAB} (@code{org-shifttab}) anywhere in an Org mode +buffer cycles the visibility of the entire outline structure, between +(i) showing only top-level heading lines, (ii) showing all heading +lines but no body lines, and (iii) showing everything. + @kindex M- @r{(Org Mode)} @kindex M- @r{(Org Mode)} @kindex M- @r{(Org Mode)} @kindex M- @r{(Org Mode)} -@kindex S-M- @r{(Org Mode)} -@kindex S-M- @r{(Org Mode)} -@kindex S-M- @r{(Org Mode)} -@kindex S-M- @r{(Org Mode)} - -Org mode extends Outline mode to turn Emacs into an organizer and an -authoring system. - -When editing a file ending with the @file{.org} extension, Emacs -automatically uses @code{org-mode} as the major mode. In this mode, -headlines start with one (or more) leading star(s) and comments start -with the @code{#} character at the beginning of a line. - -@example -* This is the first headline -** This is a first sub-headline -* This is the second headline - -Some content here. - -# Some comment here. -@end example - -From here, you can use Org mode as a simple outliner: @key{TAB} on a -headline will cycle through the various folding states of a subtree, -and @key{S-TAB} anywhere in the buffer will (un)fold the whole -structure. - -You can also manipulate the structure of your document by moving a -headline up and down with @key{M-} and @key{M-}, or by -promoting and demoting a headline with @key{M-} and -@key{M-}. If you want to act on the whole subtree (i.e. the -headline and its content, including other headlines), simply add the -@kbd{Shift} key and use @key{S-M-}, @key{S-M-}, -@key{S-M-} and @key{S-M-}. - -For further details, see @ref{Document Structure,,,org, The Org Manual}. +@findex org-metaup +@findex org-metadown +@findex org-metaleft +@findex org-metaright + You can move an entire entry up or down in the buffer, including its +body lines and subtree (if any), by typing @kbd{M-} +(@code{org-metaup}) or @kbd{M-} (@code{org-metadown}) on the +heading line. Similarly, you can promote or demote a heading line +with @kbd{M-} (@code{org-metaleft}) and @kbd{M-} +(@code{org-metaright}). These commands execute their global bindings +if invoked on a body line. + + The following subsections give basic instructions for using Org mode +as an organizer and as an authoring system. @xref{Top,The Org Mode +Manual,,org, The Org Manual}, for details. @menu -* Org as an organizer:: Manage TODO lists and agendas -* Org as an authoring system:: Export to various formats +* Org Organizer:: Managing TODO lists and agendas. +* Org Authoring:: Exporting Org buffers to various formats. @end menu -@node Org as an organizer +@node Org Organizer @subsection Org as an organizer +@cindex TODO item +@cindex Org agenda -@cindex TODO keywords @kindex C-c C-t @r{(Org Mode)} +@findex org-todo +@vindex org-todo-keywords + You can tag an Org entry as a @dfn{TODO} item by typing @kbd{C-c +C-t} (@code{org-todo}) anywhere in the entry. This adds the keyword +@samp{TODO} to the heading line. Typing @kbd{C-c C-t} again switches +the keyword to @samp{DONE}; another @kbd{C-c C-t} removes the keyword +entirely, and so forth. You can customize the keywords used by +@kbd{C-c C-t} via the variable @code{org-todo-keywords}. + @kindex C-c C-s @r{(Org Mode)} @kindex C-c C-d @r{(Org Mode)} -@vindex org-todo-keywords -@findex org-todo +@findex org-schedule +@findex org-deadline + Apart from marking an entry as TODO, you can attach a date to it, by +typing @kbd{C-c C-s} (@code{org-schedule}) in the entry. This prompts +for a date by popping up the Emacs Calendar (@pxref{Calendar/Diary}), +and then adds the tag @samp{SCHEDULED}, together with the selected +date, beneath the heading line. The command @kbd{C-c C-d} +(@code{org-deadline}) has the same effect, except that it uses the tag +@code{DEADLINE}. + +@kindex C-c [ @r{(Org Mode)} +@findex org-agenda-file-to-front +@vindex org-agenda-files + Once you have some TODO items planned in an Org file, you can add +that file to the list of @dfn{agenda files} by typing @kbd{C-c [} +(@code{org-agenda-file-to-front}). Org mode is designed to let you +easily maintain multiple agenda files, e.g.@: for organizing different +aspects of your life. The list of agenda files is stored in the +variable @code{org-agenda-files}. + @findex org-agenda -@cindex scheduled -@cindex deadline -@cindex agenda - -Each headline can be turned into a TODO item calling @code{org-todo} -with @key{C-c C-t} anywhere on it. This will add the TODO keyword -@code{TODO}. Hit @key{C-c C-t} to cycle through the list of available -TODO keywords: you can configure the variable @code{org-todo-keywords} -to use your own list of keywords. - -Now that you have something to do, let's add a date to it: pressing -@key{C-c C-s} on a headline will add @code{SCHEDULED} below it, and -you will be prompted for a date through the calendar. @key{C-c C-d} -has the same effect, except that the item will have a @code{DEADLINE} -instead. - -Now that some TODO items are planned in the current file, add it to -the list of agenda files with @key{C-c [}. Calling the interactive -command @code{org-agenda} will prompt you for what you want to see: a -list of things to do this week, a list of TODO items with specific -keywords, etc. - -For further details, see @ref{TODO items,,,org, The Org Manual} and -@ref{Dates and times,,,org, The Org Manual}. - -@node Org as an authoring system + To view items coming from your agenda files, type @kbd{M-x +org-agenda}. This command prompts for what you want to see: a list of +things to do this week, a list of TODO items with specific keywords, +etc. +@ifnottex +@xref{Agenda Views,,,org, The Org Manual}, for details. +@end ifnottex + +@node Org Authoring @subsection Org as an authoring system -@cindex export +@cindex Org exporting + @findex org-export -@cindex publish -@cindex code block -@cindex quote - -You may want to format your Org notes nicely and to prepare them for -export and publication. Org supports simple text formatting: +@kindex C-c C-e @r{(Org mode)} + You may want to format your Org notes nicely and to prepare them for +export and publication. To export the current buffer, type @kbd{C-c +C-e} (@code{org-export}) anywhere in an Org buffer. This command +prompts for an export format; currently supported formats include +HTML, La@TeX{}, OpenDocument (@file{.odt}), and PDF. Some formats, +such as PDF, require certain system tools to be installed. + +@vindex org-publish-project-alist + To export several files at once to a specific directory, either +locally or over the network, you must define a list of projects +through the variable @code{org-publish-project-alist}. See its +documentation for details. + + Org supports a simple markup scheme for applying text formatting to +exported documents: @example - This text is /emphasized/ -- This item uses *a bold font* +- This text is *in bold* - This text is _underlined_ - This text uses =a teletype font= -@end example - -If a paragraph is a quote or an example, you can use specific -environments: - -@example + #+begin_quote ``This is a quote.'' #+end_quote @@ -1376,19 +1398,7 @@ #+end_example @end example -These environments will be displayed in a specific way with respect -to the selected export/publish backend. - -To export the current buffer, press the @key{C-c C-e} key anywhere in -an Org buffer. Supported export formats include @code{HTML}, La@TeX{} -and @file{.odt} (OpenDocument format.) Depending on your system -installation, you can also directly export to @code{pdf}. - -To export several files at once to a specific directory either locally -or on the Internet, you will need to define a list of projects through -the variable @code{org-publish-project-alist}. - -For further details, see @ref{Exporting,,,org, The Org Manual} and + For further details, see @ref{Exporting,,,org, The Org Manual} and @ref{Publishing,,,org, The Org Manual}. @node TeX Mode ------------------------------------------------------------ revno: 106743 committer: Ted Zlatanov branch nick: quickfixes timestamp: Thu 2011-12-29 08:12:18 -0500 message: Fix earlier ChangeLog message from r106712. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-12-29 11:34:44 +0000 +++ lisp/ChangeLog 2011-12-29 13:12:18 +0000 @@ -108,16 +108,25 @@ 2011-12-21 Teodor Zlatanov - * progmodes/cfengine.el: Add Version. - - Add CFEngine 3.x syntax highlighting and support with - `cfengine3-mode', and rename the old `cfengine-mode' to - `cfengine2-mode'. Make `cfengine-mode' an automatic content-based - switcher between `cfengine3-mode' and `cfengine2-mode' by aliasing - it to `cfengine-auto-mode'. Rename variables specific to - `cfengine2-mode' from cfengine-* to cfengine2-*. Change the - modeline indicator to "CFE2" and "CFE3" depending on the mode, to - save space. Mark `cfengine-mode-abbrevs' as obsolete. + * progmodes/cfengine.el: Add Version. Improve CFEngine 3.x syntax + highlighting and support. Fix up comments for capitalization. + (cfengine-mode-debug): New var. + (cfengine3-mode): Change the modeline indicator to "CFE3". + (cfengine3-font-lock-keywords): Improve defun highlighting. + (cfengine2-actions): Rename from `cfengine-actions'. + (cfengine2-font-lock-keywords): Rename from + `cfengine-font-lock-keywords'. + (cfengine2-imenu-expression): Rename from + `cfengine-imenu-expression'. + (cfengine2-outline-level): Rename from `cfengine-outline-level'. + (cfengine2-beginning-of-defun): Rename from + `cfengine-beginning-of-defun'. + (cfengine2-end-of-defun): Rename from `cfengine-end-of-defun'. + (cfengine2-indent-line): Rename from `cfengine-indent-line'. + (cfengine2-mode): Rename from `cfengine-mode'. Change the + modeline indicator to "CFE2". + (cfengine-mode): Defalias to `cfengine-auto-mode'. + (cfengine-mode-abbrevs): Mark obsolete. 2011-12-21 Chong Yidong ------------------------------------------------------------ revno: 106742 committer: Michael Albinus branch nick: trunk timestamp: Thu 2011-12-29 12:34:44 +0100 message: * net/tramp-sh.el (tramp-find-shell): Set "remote-shell" property also for alternative shells. (tramp-open-connection-setup-interactive-shell): Check, whether the shell is a busybox. (tramp-send-command): Don't suppress multiple prompts for busyboxes, it hurts. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-12-28 05:23:47 +0000 +++ lisp/ChangeLog 2011-12-29 11:34:44 +0000 @@ -1,3 +1,12 @@ +2011-12-29 Michael Albinus + + * net/tramp-sh.el (tramp-find-shell): Set "remote-shell" property + also for alternative shells. + (tramp-open-connection-setup-interactive-shell): Check, whether + the shell is a busybox. + (tramp-send-command): Don't suppress multiple prompts for + busyboxes, it hurts. + 2011-12-28 Chong Yidong * progmodes/gdb-mi.el (gdb-get-source-file-list) === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2011-12-14 21:05:20 +0000 +++ lisp/net/tramp-sh.el 2011-12-29 11:34:44 +0000 @@ -3618,7 +3618,8 @@ vec 'file-error "Couldn't find a shell which groks tilde expansion")) (tramp-message - vec 5 "Starting remote shell `%s' for tilde expansion" shell) + vec 5 "Starting remote shell `%s' for tilde expansion" + (tramp-set-connection-property vec "remote-shell" shell)) (tramp-open-shell vec shell)) (t (tramp-message @@ -3785,6 +3786,17 @@ ;; Disable unexpected output. (tramp-send-command vec "mesg n; biff n" t) + ;; Busyboxes tend to behave strange. We check for the existence. + (with-connection-property vec "busybox" + (tramp-send-command + vec + (format + "%s --version" (tramp-get-connection-property vec "remote-shell" "echo")) + t) + (with-current-buffer (process-buffer proc) + (let ((case-fold-search t)) + (and (string-match "busybox" (buffer-string)) t)))) + ;; IRIX64 bash expands "!" even when in single quotes. This ;; destroys our shell functions, we must disable it. See ;; . @@ -4397,7 +4409,8 @@ ;; We mark the command string that it can be erased in the output buffer. (tramp-set-connection-property p "check-remote-echo" t) (setq command (format "%s%s%s" tramp-echo-mark command tramp-echo-mark))) - (when (string-match "<<'EOF'" command) + (when (and (string-match "<<'EOF'" command) + (not (tramp-get-connection-property vec "busybox" nil))) ;; Unset $PS1 when using here documents, in order to avoid ;; multiple prompts. (setq command (concat "(PS1= ; " command "\n)"))) ------------------------------------------------------------ revno: 106741 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Wed 2011-12-28 16:57:47 +0900 message: coding.c: (Fdefine_coding_system_internal): Make an utf-8 base coding-system ASCII compatible only when it does not produce BOM on encoding (Bug#10383). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-12-26 18:00:38 +0000 +++ src/ChangeLog 2011-12-28 07:55:49 +0000 @@ -1,3 +1,9 @@ +2011-12-28 Kenichi Handa + + * coding.c (Fdefine_coding_system_internal): Make an utf-8 base + coding-system ASCII compatible only when it does not produce BOM + on encoding (Bug#10383). + 2011-12-26 Jan Djärv * xmenu.c (x_menu_wait_for_event): Use xg_select for Gtk3 so menus === modified file 'src/coding.c' --- src/coding.c 2011-12-11 12:08:51 +0000 +++ src/coding.c 2011-12-28 07:55:49 +0000 @@ -9999,8 +9999,6 @@ { Lisp_Object bom; - CODING_ATTR_ASCII_COMPAT (attrs) = Qt; - if (nargs < coding_arg_utf8_max) goto short_args; @@ -10014,6 +10012,8 @@ CHECK_CODING_SYSTEM (val); } ASET (attrs, coding_attr_utf_bom, bom); + if (NILP (bom)) + CODING_ATTR_ASCII_COMPAT (attrs) = Qt; category = (CONSP (bom) ? coding_category_utf_8_auto : NILP (bom) ? coding_category_utf_8_nosig ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.