------------------------------------------------------------ revno: 115048 committer: Xue Fuqiao branch nick: trunk timestamp: Sat 2013-11-09 15:19:16 +0800 message: Add an cross-reference. * doc/lispref/os.texi (Command-Line Arguments): Add cross-reference for `dump-emacs'. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-11-09 05:38:28 +0000 +++ doc/lispref/ChangeLog 2013-11-09 07:19:16 +0000 @@ -2,6 +2,7 @@ * os.texi (Startup Summary): Add an index about startup screen. Typo fix. + (Command-Line Arguments): Add cross-reference for `dump-emacs'. 2013-11-08 Eli Zaretskii === modified file 'doc/lispref/os.texi' --- doc/lispref/os.texi 2013-11-09 05:38:28 +0000 +++ doc/lispref/os.texi 2013-11-09 07:19:16 +0000 @@ -517,9 +517,10 @@ The value of this variable is @code{t} once the command line has been processed. -If you redump Emacs by calling @code{dump-emacs}, you may wish to set -this variable to @code{nil} first in order to cause the new dumped Emacs -to process its new command-line arguments. +If you redump Emacs by calling @code{dump-emacs} (@pxref{Building +Emacs}), you may wish to set this variable to @code{nil} first in +order to cause the new dumped Emacs to process its new command-line +arguments. @end defvar @defvar command-switch-alist ------------------------------------------------------------ revno: 115047 committer: Xue Fuqiao branch nick: trunk timestamp: Sat 2013-11-09 13:38:28 +0800 message: * doc/lispref/os.texi (Startup Summary): Typo fix. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-11-09 02:36:46 +0000 +++ doc/lispref/ChangeLog 2013-11-09 05:38:28 +0000 @@ -1,6 +1,7 @@ 2013-11-09 Xue Fuqiao * os.texi (Startup Summary): Add an index about startup screen. + Typo fix. 2013-11-08 Eli Zaretskii === modified file 'doc/lispref/os.texi' --- doc/lispref/os.texi 2013-11-09 02:36:46 +0000 +++ doc/lispref/os.texi 2013-11-09 05:38:28 +0000 @@ -317,7 +317,7 @@ Do not initialize any display; just start a server in the background. @item --no-init-file -@itemx -Q +@itemx -q Do not load either the init file, or the @file{default} library. @item --no-site-file ------------------------------------------------------------ revno: 115046 committer: Xue Fuqiao branch nick: trunk timestamp: Sat 2013-11-09 10:36:46 +0800 message: * doc/lispref/os.texi (Startup Summary): Add an index about startup screen. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-11-08 10:27:15 +0000 +++ doc/lispref/ChangeLog 2013-11-09 02:36:46 +0000 @@ -1,3 +1,7 @@ +2013-11-09 Xue Fuqiao + + * os.texi (Startup Summary): Add an index about startup screen. + 2013-11-08 Eli Zaretskii * display.texi (Truncation): Document that cache-long-scans is now === modified file 'doc/lispref/os.texi' --- doc/lispref/os.texi 2013-07-24 13:10:38 +0000 +++ doc/lispref/os.texi 2013-11-09 02:36:46 +0000 @@ -218,6 +218,7 @@ It runs @code{window-setup-hook}. @xref{Window Systems}. @item +@cindex startup screen It displays the @dfn{startup screen}, which is a special buffer that contains information about copyleft and basic Emacs usage. This is not done if @code{inhibit-startup-screen} or @code{initial-buffer-choice} ------------------------------------------------------------ revno: 115045 committer: Dmitry Gutov branch nick: trunk timestamp: Sat 2013-11-09 03:12:25 +0200 message: * lisp/textmodes/ispell.el (ispell-lookup-words): When `look' is not available and the word has no wildcards, append one to the grep pattern. http://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00258.html (ispell-complete-word): Call `ispell-lookup-words' with the value independent of `ispell-look-p'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-08 23:59:56 +0000 +++ lisp/ChangeLog 2013-11-09 01:12:25 +0000 @@ -1,3 +1,12 @@ +2013-11-09 Dmitry Gutov + + * textmodes/ispell.el (ispell-lookup-words): When `look' is not + available and the word has no wildcards, append one to the grep + pattern. + http://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00258.html + (ispell-complete-word): Call `ispell-lookup-words' with the value + independent of `ispell-look-p'. + 2013-11-08 Dmitry Gutov * progmodes/ruby-mode.el (ruby-smie--implicit-semi-p): === modified file 'lisp/textmodes/ispell.el' --- lisp/textmodes/ispell.el 2013-09-28 02:54:27 +0000 +++ lisp/textmodes/ispell.el 2013-11-09 01:12:25 +0000 @@ -2649,8 +2649,12 @@ (message "Starting \"%s\" process..." (file-name-nondirectory prog)) (if look-p nil + (insert "^" word) + ;; When there are no wildcards, append one, for consistency + ;; with `look' behavior. + (unless wild-p (insert "*")) + (insert "$") ;; Convert * to .* - (insert "^" word "$") (while (search-backward "*" nil t) (insert ".")) (setq word (buffer-string)) (erase-buffer)) @@ -3785,8 +3789,7 @@ (or (string= word "") ; Will give you every word (ispell-lookup-words (concat (and interior-frag "*") word - (if (or interior-frag (null ispell-look-p)) - "*")) + (and interior-frag "*")) (or ispell-complete-word-dict ispell-alternate-dictionary)))) (cond ((eq possibilities t) ------------------------------------------------------------ revno: 115044 committer: Glenn Morris branch nick: trunk timestamp: Fri 2013-11-08 19:33:41 -0500 message: * nt/mingw-cfg.site: No need for this to be executable. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2013-10-24 23:04:33 +0000 +++ nt/ChangeLog 2013-11-09 00:33:41 +0000 @@ -1,3 +1,7 @@ +2013-11-09 Glenn Morris + + * mingw-cfg.site: No need for this to be executable. + 2013-10-24 Glenn Morris * Makefile.in ($(DESTDIR)${archlibdir}): === modified file 'nt/mingw-cfg.site' --- nt/mingw-cfg.site 2013-09-20 07:21:20 +0000 +++ nt/mingw-cfg.site 2013-11-09 00:33:41 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +# -*- sh -*- # Site defaults for the MinGW configuration of GNU Emacs. # # This file's purpose is to short-circuit configure-time tests for @@ -12,7 +12,7 @@ # value of a shell variable ac_cv_header_foo_h. The value should be # yes if the header is deemed to exist, no otherwise. Or it could be # something else, if the value computed by 'configure' requires that. -# In general, since nt/msysconfig.sh instructs GCC to use header files +# In general, since configure instructs GCC to use header files # in nt/inc, you should not need to futz with header file tests. But # there are exceptions, like with getopt.h below (which is a MinGW # system header, but we do not want to use it). ------------------------------------------------------------ revno: 115043 committer: Glenn Morris branch nick: trunk timestamp: Fri 2013-11-08 19:12:56 -0500 message: * admin/unidata/unidata-gen.el (unidata-gen-files): Fix deletion of existing output files after 2013-10-30 changes. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2013-11-07 07:57:35 +0000 +++ admin/ChangeLog 2013-11-09 00:12:56 +0000 @@ -1,3 +1,8 @@ +2013-11-09 Glenn Morris + + * unidata/unidata-gen.el (unidata-gen-files): + Fix deletion of existing output files after 2013-10-30 changes. + 2013-11-07 Glenn Morris * unidata/unidata-gen.el (unidata-gen-files): === modified file 'admin/unidata/unidata-gen.el' --- admin/unidata/unidata-gen.el 2013-11-07 07:57:35 +0000 +++ admin/unidata/unidata-gen.el 2013-11-09 00:12:56 +0000 @@ -1196,7 +1196,7 @@ (unidata-dir data-dir)) (dolist (elt unidata-prop-alist) (let* ((prop (car elt)) - (file (unidata-prop-file prop))) + (file (expand-file-name (unidata-prop-file prop) dest-dir))) (if (file-exists-p file) (delete-file file)))) (unidata-setup-list unidata-text-file) ------------------------------------------------------------ revno: 115042 committer: Dmitry Gutov branch nick: trunk timestamp: Sat 2013-11-09 01:59:56 +0200 message: * lisp/progmodes/ruby-mode.el (ruby-smie--implicit-semi-p): Not after "||". (ruby-smie-rules): Indent non-hanging "begin" blocks as part of their parent. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-08 22:53:41 +0000 +++ lisp/ChangeLog 2013-11-08 23:59:56 +0000 @@ -1,3 +1,10 @@ +2013-11-08 Dmitry Gutov + + * progmodes/ruby-mode.el (ruby-smie--implicit-semi-p): + Not after "||". + (ruby-smie-rules): Indent non-hanging "begin" blocks as part of + their parent. + 2013-11-08 Stefan Monnier * progmodes/ruby-mode.el: Don't require cl any more. Use pcase instead. === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2013-11-08 22:53:41 +0000 +++ lisp/progmodes/ruby-mode.el 2013-11-08 23:59:56 +0000 @@ -364,6 +364,8 @@ (and (eq (char-before) ?=) (string-match "\\`\\s." (save-excursion (ruby-smie--backward-token)))) + (and (eq (char-before) ?|) + (eq (char-before (1- (point))) ?|)) (and (eq (car (syntax-after (1- (point)))) 2) (member (save-excursion (ruby-smie--backward-token)) '("iuwu-mod" "and" "or"))) @@ -546,6 +548,9 @@ "+=" "-=" "*=" "/=" "%=" "**=" "&=" "|=" "^=" "<<=" ">>=" "&&=" "||=" "and" "or")) (if (smie-rule-parent-p ";" nil) ruby-indent-level)) + (`(:before . "begin") + (unless (save-excursion (skip-chars-backward " \t") (bolp)) + (smie-rule-parent))) )) (defun ruby-imenu-create-index-in-block (prefix beg end) === modified file 'test/indent/ruby.rb' --- test/indent/ruby.rb 2013-11-08 03:30:24 +0000 +++ test/indent/ruby.rb 2013-11-08 23:59:56 +0000 @@ -285,9 +285,14 @@ end end -# Failing with SMIE: - foo || begin bar end + +def qux + foo ||= begin + bar + tee + end +end ------------------------------------------------------------ revno: 115041 committer: Stefan Monnier branch nick: trunk timestamp: Fri 2013-11-08 17:53:41 -0500 message: * lisp/progmodes/ruby-mode.el: Don't require cl any more. Use pcase instead. (ruby-font-lock-keywords): Use backquote. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-08 21:23:11 +0000 +++ lisp/ChangeLog 2013-11-08 22:53:41 +0000 @@ -1,3 +1,8 @@ +2013-11-08 Stefan Monnier + + * progmodes/ruby-mode.el: Don't require cl any more. Use pcase instead. + (ruby-font-lock-keywords): Use backquote. + 2013-11-08 Dmitry Gutov * progmodes/ruby-mode.el (ruby-smie--forward-token) @@ -9,14 +14,14 @@ 2013-11-08 Bozhidar Batsov - * progmodes/ruby-mode.el (ruby-mode-set-encoding): Use - `ruby-encoding-magic-comment-style' to control the + * progmodes/ruby-mode.el (ruby-mode-set-encoding): + Use `ruby-encoding-magic-comment-style' to control the style of the auto-inserted encoding comment. 2013-11-08 Dmitry Gutov - * progmodes/ruby-mode.el (ruby-smie--indent-to-stmt): Use - `smie-backward-sexp' with token argument. + * progmodes/ruby-mode.el (ruby-smie--indent-to-stmt): + Use `smie-backward-sexp' with token argument. 2013-11-08 Michael Albinus === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2013-11-08 21:41:25 +0000 +++ lisp/progmodes/ruby-mode.el 2013-11-08 22:53:41 +0000 @@ -39,8 +39,6 @@ ;;; Code: -(eval-when-compile (require 'cl)) - (defgroup ruby nil "Major mode for editing Ruby code." :prefix "ruby-" @@ -357,7 +355,8 @@ (skip-chars-backward " \t") (not (or (bolp) (and (memq (char-before) - '(?\; ?- ?+ ?* ?/ ?: ?. ?, ?\[ ?\( ?\{ ?\\ ?& ?> ?< ?% ?~ ?^)) + '(?\; ?- ?+ ?* ?/ ?: ?. ?, ?\[ ?\( ?\{ ?\\ ?& ?> ?< ?% + ?~ ?^)) ;; Make sure it's not the end of a regexp. (not (eq (car (syntax-after (1- (point)))) 7))) (and (eq (char-before) ?\?) @@ -395,8 +394,8 @@ (save-excursion (goto-char pos) (or (and (eq (char-syntax (char-after)) ?w) - (not (looking-at (regexp-opt '("unless" "if" "while" "until" - "else" "elsif" "do" "end" "and" "or") + (not (looking-at (regexp-opt '("unless" "if" "while" "until" "or" + "else" "elsif" "do" "end" "and") 'symbols)))) (memq (syntax-after pos) '(7 15)) (looking-at "[([]\\|[-+!~:]\\sw"))))) @@ -654,13 +653,14 @@ ((looking-at "\\s *#.*coding\\s *[:=]")) (t (when ruby-insert-encoding-magic-comment (let ((encoding-magic-comment-template - (case ruby-encoding-magic-comment-style - (ruby "# coding: %s") - (emacs "# -*- coding: %s -*-") - (custom ruby-custom-encoding-magic-comment-template)))) - (insert - (format encoding-magic-comment-template coding-system) - "\n"))))) + (pcase ruby-encoding-magic-comment-style + (`ruby "# coding: %s") + (`emacs "# -*- coding: %s -*-") + (`custom + ruby-custom-encoding-magic-comment-template)))) + (insert + (format encoding-magic-comment-template coding-system) + "\n"))))) (when (buffer-modified-p) (basic-save-buffer-1))))))) @@ -797,7 +797,8 @@ ((looking-at "[\"`]") ;skip string (cond ((and (not (eobp)) - (ruby-forward-string (buffer-substring (point) (1+ (point))) end t t)) + (ruby-forward-string (buffer-substring (point) (1+ (point))) + end t t)) nil) (t (setq in-string (point)) @@ -1104,7 +1105,8 @@ (while (and (re-search-forward "#" pos t) (setq end (1- (point))) (or (ruby-special-char-p end) - (and (setq state (ruby-parse-region parse-start end)) + (and (setq state (ruby-parse-region + parse-start end)) (nth 0 state)))) (setq end nil)) (goto-char (or end pos)) @@ -1115,7 +1117,8 @@ (and (or (and (looking-at ruby-symbol-re) (skip-chars-backward ruby-symbol-chars) - (looking-at (concat "\\<\\(" ruby-block-hanging-re "\\)\\>")) + (looking-at (concat "\\<\\(" ruby-block-hanging-re + "\\)\\>")) (not (eq (point) (nth 3 state))) (save-excursion (goto-char (match-end 0)) @@ -1159,7 +1162,8 @@ (cond ((and (null op-end) - (not (looking-at (concat "\\<\\(" ruby-block-hanging-re "\\)\\>"))) + (not (looking-at (concat "\\<\\(" ruby-block-hanging-re + "\\)\\>"))) (eq (ruby-deep-indent-paren-p t) 'space) (not (bobp))) (widen) @@ -1296,7 +1300,8 @@ (skip-chars-forward ",.:;|&^~=!?\\+\\-\\*") (looking-at "\\s(")) (goto-char (scan-sexps (point) 1))) - ((and (looking-at (concat "\\<\\(" ruby-block-beg-re "\\)\\>")) + ((and (looking-at (concat "\\<\\(" ruby-block-beg-re + "\\)\\>")) (not (eq (char-before (point)) ?.)) (not (eq (char-before (point)) ?:))) (ruby-end-of-block) @@ -1313,7 +1318,8 @@ (progn (setq expr (or expr (ruby-expr-beg) (looking-at "%\\sw?\\Sw\\|[\"'`/]"))) - (nth 1 (setq state (apply 'ruby-parse-partial nil state)))) + (nth 1 (setq state (apply #'ruby-parse-partial + nil state)))) (setq expr t) (skip-chars-forward "<")) (not expr)))) @@ -1337,10 +1343,11 @@ (forward-char -1) (cond ((looking-at "\\s)") (goto-char (scan-sexps (1+ (point)) -1)) - (case (char-before) - (?% (forward-char -1)) - ((?q ?Q ?w ?W ?r ?x) - (if (eq (char-before (1- (point))) ?%) (forward-char -2)))) + (pcase (char-before) + (`?% (forward-char -1)) + ((or `?q `?Q `?w `?W `?r `?x) + (if (eq (char-before (1- (point))) ?%) + (forward-char -2)))) nil) ((looking-at "\\s\"\\|\\\\\\S_") (let ((c (char-to-string (char-before (match-end 0))))) @@ -1354,13 +1361,14 @@ (t (forward-char 1) (while (progn (forward-word -1) - (case (char-before) - (?_ t) - (?. (forward-char -1) t) - ((?$ ?@) + (pcase (char-before) + (`?_ t) + (`?. (forward-char -1) t) + ((or `?$ `?@) (forward-char -1) - (and (eq (char-before) (char-after)) (forward-char -1))) - (?: + (and (eq (char-before) (char-after)) + (forward-char -1))) + (`?: (forward-char -1) (eq (char-before) :))))) (if (looking-at ruby-block-end-re) @@ -1770,153 +1778,155 @@ (defconst ruby-font-lock-keyword-beg-re "\\(?:^\\|[^.@$]\\|\\.\\.\\)") (defconst ruby-font-lock-keywords - (list - ;; functions - '("^\\s *def\\s +\\(?:[^( \t\n.]*\\.\\)?\\([^( \t\n]+\\)" + `(;; Functions. + ("^\\s *def\\s +\\(?:[^( \t\n.]*\\.\\)?\\([^( \t\n]+\\)" 1 font-lock-function-name-face) - ;; keywords - (list (concat - ruby-font-lock-keyword-beg-re - (regexp-opt - '("alias" - "and" - "begin" - "break" - "case" - "class" - "def" - "defined?" - "do" - "elsif" - "else" - "fail" - "ensure" - "for" - "end" - "if" - "in" - "module" - "next" - "not" - "or" - "redo" - "rescue" - "retry" - "return" - "then" - "super" - "unless" - "undef" - "until" - "when" - "while" - "yield") - 'symbols)) - 1 'font-lock-keyword-face) - ;; some core methods - (list (concat - ruby-font-lock-keyword-beg-re - (regexp-opt - '(;; built-in methods on Kernel - "__callee__" - "__dir__" - "__method__" - "abort" - "at_exit" - "autoload" - "autoload?" - "binding" - "block_given?" - "caller" - "catch" - "eval" - "exec" - "exit" - "exit!" - "fail" - "fork" - "format" - "lambda" - "load" - "loop" - "open" - "p" - "print" - "printf" - "proc" - "putc" - "puts" - "raise" - "rand" - "readline" - "readlines" - "require" - "require_relative" - "sleep" - "spawn" - "sprintf" - "srand" - "syscall" - "system" - "throw" - "trap" - "warn" - ;; keyword-like private methods on Module - "alias_method" - "attr" - "attr_accessor" - "attr_reader" - "attr_writer" - "define_method" - "extend" - "include" - "module_function" - "prepend" - "private" - "protected" - "public" - "refine" - "using") - 'symbols)) - 1 'font-lock-builtin-face) - ;; here-doc beginnings - `(,ruby-here-doc-beg-re 0 (unless (ruby-singleton-class-p (match-beginning 0)) - 'font-lock-string-face)) - ;; Perl-ish keywords - "\\_<\\(?:BEGIN\\|END\\)\\_>\\|^__END__$" - ;; variables - `(,(concat ruby-font-lock-keyword-beg-re + ;; Keywords. + (,(concat + ruby-font-lock-keyword-beg-re + (regexp-opt + '("alias" + "and" + "begin" + "break" + "case" + "class" + "def" + "defined?" + "do" + "elsif" + "else" + "fail" + "ensure" + "for" + "end" + "if" + "in" + "module" + "next" + "not" + "or" + "redo" + "rescue" + "retry" + "return" + "then" + "super" + "unless" + "undef" + "until" + "when" + "while" + "yield") + 'symbols)) + (1 font-lock-keyword-face)) + ;; Some core methods. + (,(concat + ruby-font-lock-keyword-beg-re + (regexp-opt + '( ;; built-in methods on Kernel + "__callee__" + "__dir__" + "__method__" + "abort" + "at_exit" + "autoload" + "autoload?" + "binding" + "block_given?" + "caller" + "catch" + "eval" + "exec" + "exit" + "exit!" + "fail" + "fork" + "format" + "lambda" + "load" + "loop" + "open" + "p" + "print" + "printf" + "proc" + "putc" + "puts" + "raise" + "rand" + "readline" + "readlines" + "require" + "require_relative" + "sleep" + "spawn" + "sprintf" + "srand" + "syscall" + "system" + "throw" + "trap" + "warn" + ;; keyword-like private methods on Module + "alias_method" + "attr" + "attr_accessor" + "attr_reader" + "attr_writer" + "define_method" + "extend" + "include" + "module_function" + "prepend" + "private" + "protected" + "public" + "refine" + "using") + 'symbols)) + (1 font-lock-builtin-face)) + ;; Here-doc beginnings. + (,ruby-here-doc-beg-re + (0 (unless (ruby-singleton-class-p (match-beginning 0)) + 'font-lock-string-face))) + ;; Perl-ish keywords. + "\\_<\\(?:BEGIN\\|END\\)\\_>\\|^__END__$" + ;; Variables. + (,(concat ruby-font-lock-keyword-beg-re "\\_<\\(nil\\|self\\|true\\|false\\)\\>") 1 font-lock-variable-name-face) - ;; keywords that evaluate to certain values - '("\\_<__\\(?:LINE\\|ENCODING\\|FILE\\)__\\_>" 0 font-lock-variable-name-face) - ;; symbols - '("\\(^\\|[^:]\\)\\(:\\([-+~]@?\\|[/%&|^`]\\|\\*\\*?\\|<\\(<\\|=>?\\)?\\|>[>=]?\\|===?\\|=~\\|![~=]?\\|\\[\\]=?\\|@?\\(\\w\\|_\\)+\\([!?=]\\|\\b_*\\)\\|#{[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\)\\)" + ;; Keywords that evaluate to certain values. + ("\\_<__\\(?:LINE\\|ENCODING\\|FILE\\)__\\_>" + (0 font-lock-variable-name-face)) + ;; Symbols. + ("\\(^\\|[^:]\\)\\(:\\([-+~]@?\\|[/%&|^`]\\|\\*\\*?\\|<\\(<\\|=>?\\)?\\|>[>=]?\\|===?\\|=~\\|![~=]?\\|\\[\\]=?\\|@?\\(\\w\\|_\\)+\\([!?=]\\|\\b_*\\)\\|#{[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\)\\)" 2 font-lock-constant-face) - ;; variables - '("\\(\\$\\([^a-zA-Z0-9 \n]\\|[0-9]\\)\\)\\W" + ;; Variables. + ("\\(\\$\\([^a-zA-Z0-9 \n]\\|[0-9]\\)\\)\\W" 1 font-lock-variable-name-face) - '("\\(\\$\\|@\\|@@\\)\\(\\w\\|_\\)+" + ("\\(\\$\\|@\\|@@\\)\\(\\w\\|_\\)+" 0 font-lock-variable-name-face) - ;; constants - '("\\(?:\\_<\\|::\\)\\([A-Z]+\\(\\w\\|_\\)*\\)" + ;; Constants. + ("\\(?:\\_<\\|::\\)\\([A-Z]+\\(\\w\\|_\\)*\\)" 1 (unless (eq ?\( (char-after)) font-lock-type-face)) - '("\\(^\\s *\\|[\[\{\(,]\\s *\\|\\sw\\s +\\)\\(\\(\\sw\\|_\\)+\\):[^:]" 2 font-lock-constant-face) - ;; conversion methods on Kernel - (list (concat ruby-font-lock-keyword-beg-re - (regexp-opt '("Array" "Complex" "Float" "Hash" - "Integer" "Rational" "String") 'symbols)) - 1 font-lock-builtin-face) - ;; expression expansion - '(ruby-match-expression-expansion + ("\\(^\\s *\\|[\[\{\(,]\\s *\\|\\sw\\s +\\)\\(\\(\\sw\\|_\\)+\\):[^:]" + (2 font-lock-constant-face)) + ;; Conversion methods on Kernel. + (,(concat ruby-font-lock-keyword-beg-re + (regexp-opt '("Array" "Complex" "Float" "Hash" + "Integer" "Rational" "String") 'symbols)) + (1 font-lock-builtin-face)) + ;; Expression expansion. + (ruby-match-expression-expansion 2 font-lock-variable-name-face t) - ;; negation char - '("[^[:alnum:]_]\\(!\\)[^=]" + ;; Negation char. + ("[^[:alnum:]_]\\(!\\)[^=]" 1 font-lock-negation-char-face) - ;; character literals - ;; FIXME: Support longer escape sequences. - '("\\_<\\?\\\\?\\S " 0 font-lock-string-face) - ) + ;; Character literals. + ;; FIXME: Support longer escape sequences. + ("\\_<\\?\\\\?\\S " 0 font-lock-string-face) + ) "Additional expressions to highlight in Ruby mode.") (defun ruby-match-expression-expansion (limit) ------------------------------------------------------------ revno: 115040 committer: Bozhidar Batsov branch nick: master timestamp: Fri 2013-11-08 23:41:25 +0200 message: * lisp/progmodes/ruby-mode.el (ruby-mode-set-encoding): Fix incorrect case conditions. diff: === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2013-11-08 21:23:11 +0000 +++ lisp/progmodes/ruby-mode.el 2013-11-08 21:41:25 +0000 @@ -655,9 +655,9 @@ (t (when ruby-insert-encoding-magic-comment (let ((encoding-magic-comment-template (case ruby-encoding-magic-comment-style - ('ruby "# coding: %s") - ('emacs "# -*- coding: %s -*-") - ('custom ruby-custom-encoding-magic-comment-template)))) + (ruby "# coding: %s") + (emacs "# -*- coding: %s -*-") + (custom ruby-custom-encoding-magic-comment-template)))) (insert (format encoding-magic-comment-template coding-system) "\n"))))) ------------------------------------------------------------ revno: 115039 committer: Dmitry Gutov branch nick: trunk timestamp: Fri 2013-11-08 23:23:11 +0200 message: * lisp/progmodes/ruby-mode.el (ruby-smie--forward-token) (ruby-smie--backward-token): Only consider full-string matches. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-08 17:26:03 +0000 +++ lisp/ChangeLog 2013-11-08 21:23:11 +0000 @@ -1,3 +1,8 @@ +2013-11-08 Dmitry Gutov + + * progmodes/ruby-mode.el (ruby-smie--forward-token) + (ruby-smie--backward-token): Only consider full-string matches. + 2013-11-08 Jan Djärv * faces.el (describe-face): Add distant-foreground. === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2013-11-08 16:01:55 +0000 +++ lisp/progmodes/ruby-mode.el 2013-11-08 21:23:11 +0000 @@ -438,7 +438,7 @@ ((member tok '("unless" "if" "while" "until")) (if (save-excursion (forward-word -1) (ruby-smie--bosp)) tok "iuwu-mod")) - ((string-match "|[*&]?" tok) + ((string-match-p "\\`|[*&]?\\'" tok) (forward-char (- 1 (length tok))) (setq tok "|") (if (ruby-smie--opening-pipe-p) "opening-|" tok)) @@ -482,7 +482,7 @@ tok "iuwu-mod")) ((equal tok "|") (if (ruby-smie--opening-pipe-p) "opening-|" tok)) - ((string-match-p "|[*&]" tok) + ((string-match-p "\\`|[*&]\\'" tok) (forward-char 1) (substring tok 1)) ((and (equal tok "") (eq ?\\ (char-before)) (looking-at "\n")) ------------------------------------------------------------ revno: 115038 fixes bug: http://debbugs.gnu.org/15815 committer: Jan D. branch nick: trunk timestamp: Fri 2013-11-08 18:26:03 +0100 message: * lisp/faces.el (describe-face): Add distant-foreground. * src/xfaces.c (lface_fully_specified_p): Let distant-foreground be unspecified. (realize_default_face): Remove assignment to distant-foreground if unspecified. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-08 16:01:55 +0000 +++ lisp/ChangeLog 2013-11-08 17:26:03 +0000 @@ -1,3 +1,7 @@ +2013-11-08 Jan Djärv + + * faces.el (describe-face): Add distant-foreground. + 2013-11-08 Bozhidar Batsov * progmodes/ruby-mode.el (ruby-mode-set-encoding): Use === modified file 'lisp/faces.el' --- lisp/faces.el 2013-11-01 15:47:10 +0000 +++ lisp/faces.el 2013-11-08 17:26:03 +0000 @@ -1350,6 +1350,7 @@ (:weight . "Weight") (:slant . "Slant") (:foreground . "Foreground") + (:distant-foreground . "DistantForeground") (:background . "Background") (:underline . "Underline") (:overline . "Overline") === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-08 16:24:40 +0000 +++ src/ChangeLog 2013-11-08 17:26:03 +0000 @@ -1,3 +1,10 @@ +2013-11-08 Jan Djärv + + * xfaces.c (lface_fully_specified_p): Let distant-foreground be + unspecified. + (realize_default_face): Remove assignment to distant-foreground if + unspecified (Bug#15815). + 2013-11-08 Eli Zaretskii * xdisp.c (message_dolog): Make sure the *Messages* buffer has its === modified file 'src/xfaces.c' --- src/xfaces.c 2013-11-06 04:11:04 +0000 +++ src/xfaces.c 2013-11-08 17:26:03 +0000 @@ -2073,7 +2073,8 @@ int i; for (i = 1; i < LFACE_VECTOR_SIZE; ++i) - if (i != LFACE_FONT_INDEX && i != LFACE_INHERIT_INDEX) + if (i != LFACE_FONT_INDEX && i != LFACE_INHERIT_INDEX + && i != LFACE_DISTANT_FOREGROUND_INDEX) if ((UNSPECIFIEDP (attrs[i]) || IGNORE_DEFFACE_P (attrs[i]))) break; @@ -5343,9 +5344,6 @@ emacs_abort (); } - if (UNSPECIFIEDP (LFACE_DISTANT_FOREGROUND (lface))) - ASET (lface, LFACE_DISTANT_FOREGROUND_INDEX, build_string (unspecified_fg)); - if (UNSPECIFIEDP (LFACE_BACKGROUND (lface))) { /* This function is called so early that colors are not yet ------------------------------------------------------------ revno: 115037 committer: Paul Eggert branch nick: trunk timestamp: Fri 2013-11-08 08:24:40 -0800 message: Merge from gnulib. This incorporates: 2013-11-08 extern-inline: port better to OS X 10.9 2013-11-08 fpending: fix regression on DragonFly BSD * lib/fpending.h, m4/extern-inline.m4, m4/fpending.m4: Update from gnulib. diff: === modified file 'ChangeLog' --- ChangeLog 2013-11-07 05:31:04 +0000 +++ ChangeLog 2013-11-08 16:24:40 +0000 @@ -1,3 +1,11 @@ +2013-11-08 Paul Eggert + + Merge from gnulib, incorporating: + 2013-11-08 extern-inline: port better to OS X 10.9 + 2013-11-08 fpending: fix regression on DragonFly BSD + * lib/fpending.h, m4/extern-inline.m4, m4/fpending.m4: + Update from gnulib. + 2013-11-07 Paul Eggert Port to C11 aligned_alloc. === modified file 'lib/fpending.h' --- lib/fpending.h 2013-10-23 04:01:46 +0000 +++ lib/fpending.h 2013-11-08 16:24:40 +0000 @@ -24,6 +24,6 @@ # include #endif -#ifndef __fpending +#if !HAVE_DECL___FPENDING size_t __fpending (FILE *) _GL_ATTRIBUTE_PURE; #endif === modified file 'm4/extern-inline.m4' --- m4/extern-inline.m4 2013-10-23 04:01:46 +0000 +++ m4/extern-inline.m4 2013-11-08 16:24:40 +0000 @@ -1,4 +1,3 @@ -# extern-inline.m4 serial 2 dnl 'extern inline' a la ISO C99. dnl Copyright 2012-2013 Free Software Foundation, Inc. @@ -20,15 +19,20 @@ 'reference to static identifier "f" in extern inline function'. This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16. - Suppress the use of extern inline on problematic Apple configurations, as - Libc at least through Libc-825.26 (2013-04-09) mishandles it; see, e.g., + Suppress the use of extern inline on problematic Apple configurations. + OS X 10.8 and earlier mishandle it; see, e.g., . + OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and + for clang but remains for g++; see . Perhaps Apple will fix this some day. */ #if (defined __APPLE__ \ - && ((! defined _DONT_USE_CTYPE_INLINE_ \ - && (defined __GNUC__ || defined __cplusplus)) \ - || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ - && defined __GNUC__ && ! defined __cplusplus))) + && (defined __header_inline \ + ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ + && ! defined __clang__) \ + : ((! defined _DONT_USE_CTYPE_INLINE_ \ + && (defined __GNUC__ || defined __cplusplus)) \ + || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ + && defined __GNUC__ && ! defined __cplusplus)))) # define _GL_EXTERN_INLINE_APPLE_BUG #endif #if ((__GNUC__ \ === modified file 'm4/fpending.m4' --- m4/fpending.m4 2013-08-12 00:52:17 +0000 +++ m4/fpending.m4 2013-11-08 16:24:40 +0000 @@ -1,4 +1,4 @@ -# serial 20 +# serial 21 # Copyright (C) 2000-2001, 2004-2013 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -16,19 +16,23 @@ AC_DEFUN([gl_FUNC_FPENDING], [ AC_CHECK_HEADERS_ONCE([stdio_ext.h]) + fp_headers=' + #include + #if HAVE_STDIO_EXT_H + # include + #endif + ' AC_CACHE_CHECK([for __fpending], [gl_cv_func___fpending], [ AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include - #if HAVE_STDIO_EXT_H - # include - #endif - ]], + [AC_LANG_PROGRAM([$fp_headers], [[return ! __fpending (stdin);]])], [gl_cv_func___fpending=yes], [gl_cv_func___fpending=no]) ]) + if test $gl_cv_func___fpending = yes; then + AC_CHECK_DECLS([__fpending], [], [], [$fp_headers]) + fi ]) AC_DEFUN([gl_PREREQ_FPENDING], === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-08 10:21:35 +0000 +++ src/ChangeLog 2013-11-08 16:24:40 +0000 @@ -16,6 +16,8 @@ 2013-11-08 Paul Eggert + * gmalloc.c (special_realloc, calloc, mallochook): Use tail calls. + * chartab.c (make_sub_char_table): Fix size typo (Bug#15825). This bug was introduced in my 2013-06-21 change, and caused struct Lisp_Sub_Char_Table objects to be given too many slots, === modified file 'src/gmalloc.c' --- src/gmalloc.c 2013-11-07 05:31:04 +0000 +++ src/gmalloc.c 2013-11-08 16:24:40 +0000 @@ -1307,8 +1307,8 @@ type == 0 ? bss_sbrk_heapinfo[block].busy.info.size * BLOCKSIZE : (size_t) 1 << type; result = _malloc_internal_nolock (size); - if (result != NULL) - memcpy (result, ptr, min (oldsize, size)); + if (result) + return memcpy (result, ptr, min (oldsize, size)); return result; } #endif @@ -1501,7 +1501,7 @@ result = malloc (bytes); if (result) - memset (result, 0, bytes); + return memset (result, 0, bytes); return result; } /* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. @@ -1814,8 +1814,7 @@ hdr->size = size; hdr->magic = MAGICWORD; ((char *) &hdr[1])[size] = MAGICBYTE; - memset (hdr + 1, MALLOCFLOOD, size); - return hdr + 1; + return memset (hdr + 1, MALLOCFLOOD, size); } static void * ------------------------------------------------------------ revno: 115036 committer: Bozhidar Batsov branch nick: master timestamp: Fri 2013-11-08 18:01:55 +0200 message: * lisp/progmodes/ruby-mode.el (ruby-mode-set-encoding): Use `ruby-encoding-magic-comment-style' to control the style of the auto-inserted encoding comment. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-08 11:22:52 +0000 +++ lisp/ChangeLog 2013-11-08 16:01:55 +0000 @@ -1,3 +1,9 @@ +2013-11-08 Bozhidar Batsov + + * progmodes/ruby-mode.el (ruby-mode-set-encoding): Use + `ruby-encoding-magic-comment-style' to control the + style of the auto-inserted encoding comment. + 2013-11-08 Dmitry Gutov * progmodes/ruby-mode.el (ruby-smie--indent-to-stmt): Use === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2013-11-08 11:22:52 +0000 +++ lisp/progmodes/ruby-mode.el 2013-11-08 16:01:55 +0000 @@ -261,6 +261,20 @@ "Insert a magic Emacs 'coding' comment upon save if this is non-nil." :type 'boolean :group 'ruby) +(defcustom ruby-encoding-magic-comment-style 'ruby + "The style of the magic encoding comment to use." + :type '(choice + (const :tag "Emacs Style" emacs) + (const :tag "Ruby Style" ruby) + (const :tag "Custom Style" custom)) + :group 'ruby) + +(defcustom ruby-custom-encoding-magic-comment-template "# coding: %s" + "The encoding comment template to be used when +`ruby-encoding-magic-comment-style' is set to `custom'." + :type 'string + :group 'ruby) + (defcustom ruby-use-encoding-map t "Use `ruby-encoding-map' to set encoding magic comment if this is non-nil." :type 'boolean :group 'ruby) @@ -639,7 +653,14 @@ (insert coding-system))) ((looking-at "\\s *#.*coding\\s *[:=]")) (t (when ruby-insert-encoding-magic-comment - (insert "# -*- coding: " coding-system " -*-\n")))) + (let ((encoding-magic-comment-template + (case ruby-encoding-magic-comment-style + ('ruby "# coding: %s") + ('emacs "# -*- coding: %s -*-") + ('custom ruby-custom-encoding-magic-comment-template)))) + (insert + (format encoding-magic-comment-template coding-system) + "\n"))))) (when (buffer-modified-p) (basic-save-buffer-1))))))) ------------------------------------------------------------ revno: 115035 committer: Dmitry Gutov branch nick: trunk timestamp: Fri 2013-11-08 13:22:52 +0200 message: * lisp/progmodes/ruby-mode.el (ruby-smie--indent-to-stmt): Use `smie-backward-sexp' with token argument. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-08 09:31:50 +0000 +++ lisp/ChangeLog 2013-11-08 11:22:52 +0000 @@ -1,3 +1,8 @@ +2013-11-08 Dmitry Gutov + + * progmodes/ruby-mode.el (ruby-smie--indent-to-stmt): Use + `smie-backward-sexp' with token argument. + 2013-11-08 Michael Albinus * net/tramp-sh.el (tramp-set-remote-path, tramp-get-ls-command): === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2013-11-08 02:31:51 +0000 +++ lisp/progmodes/ruby-mode.el 2013-11-08 11:22:52 +0000 @@ -485,13 +485,8 @@ (defun ruby-smie--indent-to-stmt () (save-excursion - (let (parent) - (while (not (or (eq (car parent) t) - (equal (nth 2 parent) ";"))) - (setq parent (let (smie--parent) (smie-indent--parent))) - (when (numberp (nth 1 parent)) - (goto-char (nth 1 parent)))) - (cons 'column (smie-indent-virtual))))) + (smie-backward-sexp ";") + (cons 'column (smie-indent-virtual)))) (defun ruby-smie-rules (kind token) (pcase (cons kind token) ------------------------------------------------------------ revno: 115034 fixes bug: http://debbugs.gnu.org/15797 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2013-11-08 12:27:15 +0200 message: Documentation followup to last commit. doc/lispref/display.texi (Truncation): Document that cache-long-scans is now non-nil by default. (Bug#15797) diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-11-05 17:47:48 +0000 +++ doc/lispref/ChangeLog 2013-11-08 10:27:15 +0000 @@ -1,3 +1,8 @@ +2013-11-08 Eli Zaretskii + + * display.texi (Truncation): Document that cache-long-scans is now + non-nil by default. (Bug#15797) + 2013-11-05 Eli Zaretskii * lists.texi (Rearrangement): Fix indexing. === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2013-11-06 14:22:02 +0000 +++ doc/lispref/display.texi 2013-11-08 10:27:15 +0000 @@ -214,19 +214,16 @@ over the @code{line-prefix} variable. @xref{Special Properties}. @end defvar - If your buffer contains @emph{very} long lines, and you use -continuation to display them, computing the continuation lines can -make redisplay slow. The column computation and indentation functions -also become slow. Then you might find it advisable to set -@code{cache-long-scans} to @code{t}. + If your buffer contains only very short lines, you might find it +advisable to set @code{cache-long-scans} to @code{nil}. @defvar cache-long-scans -If this variable is non-@code{nil}, various indentation and motion -functions, and Emacs redisplay, cache the results of scanning the -buffer, and consult the cache to avoid rescanning regions of the buffer -unless they are modified. +If this variable is non-@code{nil} (the default), various indentation +and motion functions, and Emacs redisplay, cache the results of +scanning the buffer, and consult the cache to avoid rescanning regions +of the buffer unless they are modified. -Turning on the cache slows down processing of short lines somewhat. +Turning off the cache speeds up processing of short lines somewhat. This variable is automatically buffer-local in every buffer. @end defvar ------------------------------------------------------------ revno: 115033 fixes bug: http://debbugs.gnu.org/15797 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2013-11-08 12:21:35 +0200 message: Switch cache-long-scans to t by default. src/xdisp.c (message_dolog): Make sure the *Messages* buffer has its cache-long-scans disabled, since we don't want to call prepare_to_modify_buffer (in insert_1_both) for each message we display. src/buffer.h (bset_cache_long_scans): New INLINE function, moved from buffer.c. Improve commentary to the buffer field setter functions. src/buffer.c (bset_cache_long_scans): Static function deleted. Improve commentary to the buffer field setter functions. (init_buffer_once): Default for cache-long-scans changed to t. (Bug#15797) diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-08 07:28:21 +0000 +++ src/ChangeLog 2013-11-08 10:21:35 +0000 @@ -1,3 +1,19 @@ +2013-11-08 Eli Zaretskii + + * xdisp.c (message_dolog): Make sure the *Messages* buffer has its + cache-long-scans disabled, since we don't want to call + prepare_to_modify_buffer (in insert_1_both) for each message we + display. + + * buffer.h (bset_cache_long_scans): New INLINE function, moved + from buffer.c. Improve commentary to the buffer field setter + functions. + + * buffer.c (bset_cache_long_scans): Static function deleted. + Improve commentary to the buffer field setter functions. + (init_buffer_once): Default for cache-long-scans changed to t. + (Bug#15797) + 2013-11-08 Paul Eggert * chartab.c (make_sub_char_table): Fix size typo (Bug#15825). === modified file 'src/buffer.c' --- src/buffer.c 2013-11-06 18:41:31 +0000 +++ src/buffer.c 2013-11-08 10:21:35 +0000 @@ -154,7 +154,8 @@ CHECK_TYPE (OVERLAYP (x), Qoverlayp, x); } -/* These setters are used only in this file, so they can be private. */ +/* These setters are used only in this file, so they can be private. + The public setters are inline functions defined in buffer.h. */ static void bset_abbrev_mode (struct buffer *b, Lisp_Object val) { @@ -201,11 +202,6 @@ b->INTERNAL_FIELD (buffer_file_coding_system) = val; } static void -bset_cache_long_scans (struct buffer *b, Lisp_Object val) -{ - b->INTERNAL_FIELD (cache_long_scans) = val; -} -static void bset_case_fold_search (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (case_fold_search) = val; @@ -5185,7 +5181,7 @@ bset_buffer_file_coding_system (&buffer_defaults, Qnil); XSETFASTINT (BVAR (&buffer_defaults, fill_column), 70); XSETFASTINT (BVAR (&buffer_defaults, left_margin), 0); - bset_cache_long_scans (&buffer_defaults, Qnil); + bset_cache_long_scans (&buffer_defaults, Qt); bset_file_truename (&buffer_defaults, Qnil); XSETFASTINT (BVAR (&buffer_defaults, display_count), 0); XSETFASTINT (BVAR (&buffer_defaults, left_margin_cols), 0); === modified file 'src/buffer.h' --- src/buffer.h 2013-09-20 15:34:36 +0000 +++ src/buffer.h 2013-11-08 10:21:35 +0000 @@ -871,13 +871,19 @@ }; /* Most code should use these functions to set Lisp fields in struct - buffer. */ + buffer. (Some setters that are priviate to a single .c file are + defined as static in those files.) */ INLINE void bset_bidi_paragraph_direction (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (bidi_paragraph_direction) = val; } INLINE void +bset_cache_long_scans (struct buffer *b, Lisp_Object val) +{ + b->INTERNAL_FIELD (cache_long_scans) = val; +} +INLINE void bset_case_canon_table (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (case_canon_table) = val; === modified file 'src/xdisp.c' --- src/xdisp.c 2013-11-06 21:17:26 +0000 +++ src/xdisp.c 2013-11-08 10:21:35 +0000 @@ -9488,6 +9488,7 @@ } bset_undo_list (current_buffer, Qt); + bset_cache_long_scans (current_buffer, Qnil); oldpoint = message_dolog_marker1; set_marker_restricted_both (oldpoint, Qnil, PT, PT_BYTE); ------------------------------------------------------------ revno: 115032 committer: Michael Albinus branch nick: trunk timestamp: Fri 2013-11-08 10:31:50 +0100 message: * net/tramp-sh.el (tramp-set-remote-path, tramp-get-ls-command): Remove instrumentation code. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-08 08:22:50 +0000 +++ lisp/ChangeLog 2013-11-08 09:31:50 +0000 @@ -1,3 +1,8 @@ +2013-11-08 Michael Albinus + + * net/tramp-sh.el (tramp-set-remote-path, tramp-get-ls-command): + Remove instrumentation code. + 2013-11-08 Glenn Morris * progmodes/autoconf.el (autoconf-mode): === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2013-11-07 11:13:41 +0000 +++ lisp/net/tramp-sh.el 2013-11-08 09:31:50 +0000 @@ -3576,12 +3576,6 @@ I.e., for each directory in `tramp-remote-path', it is tested whether it exists and if so, it is added to the environment variable PATH." - (when (featurep 'ert) - (ignore-errors - (with-demoted-errors - (message - "tramp-set-remote-path:\n%s\n" - (tramp-send-command-and-read vec "echo PATH=$PATH"))))) (tramp-message vec 5 "Setting $PATH environment variable") (tramp-send-command vec (format "PATH=%s; export PATH" @@ -4837,23 +4831,7 @@ remote-path))))) (defun tramp-get-ls-command (vec) -; (with-tramp-connection-property vec "ls" - (when (featurep 'ert) - (ignore-errors - (with-demoted-errors - (message - "tramp-get-ls-command printenv:\n%s\n" - (tramp-send-command-and-read - vec "echo \"\\\"`(printenv | sort) || exit`\\\"\""))) - (with-demoted-errors - (message - "tramp-get-ls-command getconf PATH:\n%s\n" - (tramp-send-command-and-read - vec "echo \\\"`getconf PATH 2>/dev/null || exit`\\\""))) - (with-demoted-errors - (message - "tramp-get-ls-command whereis ls:\n%s\n" - (tramp-send-command-and-read vec "echo \"\\\"`whereis ls || exit`\\\"\""))))) + (with-tramp-connection-property vec "ls" (tramp-message vec 5 "Finding a suitable `ls' command") (or (catch 'ls-found @@ -4875,7 +4853,7 @@ (setq result (concat result " --color=never"))) (throw 'ls-found result)) (setq dl (cdr dl)))))) - (tramp-error vec 'file-error "Couldn't find a proper `ls' command")));) + (tramp-error vec 'file-error "Couldn't find a proper `ls' command")))) (defun tramp-get-ls-command-with-dired (vec) (save-match-data