[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117023: Merge from emacs-24; up to r117019
|
From: |
Juanma Barranquero |
|
Subject: |
[Emacs-diffs] trunk r117023: Merge from emacs-24; up to r117019 |
|
Date: |
Fri, 25 Apr 2014 16:11:45 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117023 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Fri 2014-04-25 18:11:07 +0200
message:
Merge from emacs-24; up to r117019
modified:
doc/lispref/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6155
doc/lispref/strings.texi
strings.texi-20091113204419-o5vbwnq5f7feedwu-6212
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/comint.el comint.el-20091113204419-o5vbwnq5f7feedwu-149
lisp/emacs-lisp/cl.el cl.el-20120602223038-xinq5bdyxpqhvm6q-1
lisp/emacs-lisp/lisp-mode.el lispmode.el-20091113204419-o5vbwnq5f7feedwu-205
lisp/progmodes/idlwave.el idlwave.el-20091113204419-o5vbwnq5f7feedwu-1731
lisp/progmodes/perl-mode.el perlmode.el-20091113204419-o5vbwnq5f7feedwu-402
lisp/simple.el simple.el-20091113204419-o5vbwnq5f7feedwu-403
lisp/term.el term.el-20091113204419-o5vbwnq5f7feedwu-794
lisp/term/xterm.el xterm.el-20091113204419-o5vbwnq5f7feedwu-884
lisp/tooltip.el tooltip.el-20091113204419-o5vbwnq5f7feedwu-1322
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/search.c search.c-20091113204419-o5vbwnq5f7feedwu-473
test/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-8588
test/automated/file-notify-tests.el
filenotifytests.el-20130702144123-sxglvo6zs3jcj8w1-1
test/automated/tramp-tests.el tramptests.el-20131105142319-d9zp3oprkpxj5v1e-1
test/indent/perl.perl perl.perl-20121031024456-cjjxr53eeyg5rvml-1
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2014-04-22 21:32:51 +0000
+++ b/doc/lispref/ChangeLog 2014-04-25 16:11:07 +0000
@@ -1,3 +1,9 @@
+2014-04-25 Eli Zaretskii <address@hidden>
+
+ * strings.texi (Text Comparison): Mention
+ equal-including-properties for when text properties of the strings
+ matter for comparison.
+
2014-04-22 Eli Zaretskii <address@hidden>
* text.texi (Registers): Document register-read-with-preview.
=== modified file 'doc/lispref/strings.texi'
--- a/doc/lispref/strings.texi 2014-03-18 01:19:03 +0000
+++ b/doc/lispref/strings.texi 2014-04-24 15:11:04 +0000
@@ -423,8 +423,10 @@
This function is equivalent to @code{equal} for comparing two strings
(@pxref{Equality Predicates}). In particular, the text properties of
-the two strings are ignored. But if either argument is not a string
-or symbol, an error is signaled.
+the two strings are ignored; use @code{equal-including-properties} if
+you need to distinguish between strings that differ only in their text
+properties. However, unlike @code{equal}, if either argument is not a
+string or symbol, @code{string=} signals an error.
@example
(string= "abc" "abc")
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-04-24 22:37:28 +0000
+++ b/lisp/ChangeLog 2014-04-25 16:11:07 +0000
@@ -1,3 +1,37 @@
+2014-04-25 Eli Zaretskii <address@hidden>
+
+ * tooltip.el (tooltip-show-help-non-mode, tooltip-show-help): Use
+ equal-including-properties to compare help-echo strings. (Bug#17331)
+
+2014-04-25 Leo Liu <address@hidden>
+
+ * emacs-lisp/lisp-mode.el (emacs-lisp-mode-syntax-table):
+ Fix syntax for @. (Bug#17325)
+
+2014-04-25 Daniel Colascione <address@hidden>
+
+ * emacs-lisp/cl.el (gv): Require gv early to break eager
+ macro-expansion cycles.
+
+2014-04-25 Stefan Monnier <address@hidden>
+
+ * simple.el (region-active-p): Check there's a mark (bug#17324).
+
+ * simple.el (completion-list-mode-map): Use choose-completion for the
+ mouse binding as well (bug#17302).
+ (completion-list-mode, completion-setup-function): Adjust docstring and
+ echo area message accordingly.
+ * progmodes/idlwave.el (idlwave-choose-completion): Adjust to new
+ calling convention of choose-completion.
+ * comint.el (comint-dynamic-list-completions):
+ * term.el (term-dynamic-list-completions): Accept choose-completion.
+
+ * progmodes/perl-mode.el (perl-syntax-propertize-function): Slash after
+ &, |, +, - and * can't be a division (bug#17317).
+
+ * term/xterm.el (xterm--version-handler): Don't use modern xterm
+ features on gnome-terminal (bug#16988).
+
2014-04-25 Thien-Thi Nguyen <address@hidden>
Improve Scheme font-locking for (define ((foo ...) ...) ...).
=== modified file 'lisp/comint.el'
--- a/lisp/comint.el 2014-03-30 19:12:57 +0000
+++ b/lisp/comint.el 2014-04-25 16:11:07 +0000
@@ -3332,8 +3332,9 @@
(and (consp first) (consp (event-start first))
(eq (window-buffer (posn-window (event-start first)))
(get-buffer "*Completions*"))
- (eq (key-binding key) 'mouse-choose-completion)))
- ;; If the user does mouse-choose-completion with the mouse,
+ (memq (key-binding key)
+ '(mouse-choose-completion choose-completion))))
+ ;; If the user does choose-completion with the mouse,
;; execute the command, then delete the completion window.
(progn
(choose-completion first)
=== modified file 'lisp/emacs-lisp/cl.el'
--- a/lisp/emacs-lisp/cl.el 2014-01-01 07:43:34 +0000
+++ b/lisp/emacs-lisp/cl.el 2014-04-24 00:28:47 +0000
@@ -29,6 +29,7 @@
(require 'cl-lib)
(require 'macroexp)
+(require 'gv)
;; (defun cl--rename ()
;; (let ((vdefs ())
=== modified file 'lisp/emacs-lisp/lisp-mode.el'
--- a/lisp/emacs-lisp/lisp-mode.el 2014-04-22 17:45:43 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el 2014-04-25 16:11:07 +0000
@@ -74,7 +74,7 @@
(modify-syntax-entry ?` "' " table)
(modify-syntax-entry ?' "' " table)
(modify-syntax-entry ?, "' " table)
- (modify-syntax-entry ?@ "' " table)
+ (modify-syntax-entry ?@ "_ p" table)
;; Used to be singlequote; changed for flonums.
(modify-syntax-entry ?. "_ " table)
(modify-syntax-entry ?# "' " table)
=== modified file 'lisp/progmodes/idlwave.el'
--- a/lisp/progmodes/idlwave.el 2014-01-27 02:02:28 +0000
+++ b/lisp/progmodes/idlwave.el 2014-04-23 02:22:06 +0000
@@ -7170,7 +7170,7 @@
(defun idlwave-choose-completion (&rest args)
"Choose the completion that point is in or next to."
- (interactive)
+ (interactive (list last-nonmenu-event))
(apply 'idlwave-choose 'choose-completion args))
(defun idlwave-mouse-choose-completion (&rest args)
=== modified file 'lisp/progmodes/perl-mode.el'
--- a/lisp/progmodes/perl-mode.el 2014-04-16 14:13:06 +0000
+++ b/lisp/progmodes/perl-mode.el 2014-04-23 01:56:18 +0000
@@ -281,7 +281,7 @@
((concat "\\(?:\\(?:^\\|[^$@&%[:word:]]\\)"
(regexp-opt '("split" "if" "unless" "until" "while" "split"
"grep" "map" "not" "or" "and" "for" "foreach"))
- "\\|[?:.,;=!~({[]\\|\\(^\\)\\)[ \t\n]*\\(/\\)")
+ "\\|[-?:.,;|&+*=!~({[]\\|\\(^\\)\\)[ \t\n]*\\(/\\)")
(2 (ignore
(if (and (match-end 1) ; / at BOL.
(save-excursion
=== modified file 'lisp/simple.el'
--- a/lisp/simple.el 2014-04-16 19:43:46 +0000
+++ b/lisp/simple.el 2014-04-25 16:11:07 +0000
@@ -4503,7 +4503,12 @@
mode is enabled. Usually, such commands should use
`use-region-p' instead of this function, because `use-region-p'
also checks the value of `use-empty-active-region'."
- (and transient-mark-mode mark-active))
+ (and transient-mark-mode mark-active
+ ;; FIXME: Somehow we sometimes end up with mark-active non-nil but
+ ;; without the mark being set (e.g. bug#17324). We really should fix
+ ;; that problem, but in the mean time, let's make sure we don't say the
+ ;; region is active when there's no mark.
+ (mark)))
(defvar redisplay-unhighlight-region-function
@@ -6872,7 +6877,7 @@
(defvar completion-list-mode-map
(let ((map (make-sparse-keymap)))
- (define-key map [mouse-2] 'mouse-choose-completion)
+ (define-key map [mouse-2] 'choose-completion)
(define-key map [follow-link] 'mouse-face)
(define-key map [down-mouse-2] nil)
(define-key map "\C-m" 'choose-completion)
@@ -7121,8 +7126,7 @@
"Major mode for buffers showing lists of possible completions.
Type \\<completion-list-mode-map>\\[choose-completion] in the completion list\
to select the completion near point.
-Use \\<completion-list-mode-map>\\[mouse-choose-completion] to select one\
- with the mouse.
+Or click to select one with the mouse.
\\{completion-list-mode-map}"
(set (make-local-variable 'completion-base-size) nil))
@@ -7180,7 +7184,7 @@
(goto-char (point-min))
(if (display-mouse-p)
(insert (substitute-command-keys
- "Click \\[mouse-choose-completion] on a completion to
select it.\n")))
+ "Click on a completion to select it.\n")))
(insert (substitute-command-keys
"In this buffer, type \\[choose-completion] to \
select the completion near point.\n\n"))))))
=== modified file 'lisp/term.el'
--- a/lisp/term.el 2014-01-22 10:29:23 +0000
+++ b/lisp/term.el 2014-04-23 02:22:06 +0000
@@ -4137,8 +4137,9 @@
(and (consp first)
(eq (window-buffer (posn-window (event-start first)))
(get-buffer "*Completions*"))
- (eq (key-binding key) 'mouse-choose-completion)))
- ;; If the user does mouse-choose-completion with the mouse,
+ (memq (key-binding key)
+ '(mouse-choose-completion choose-completion))))
+ ;; If the user does choose-completion with the mouse,
;; execute the command, then delete the completion window.
(progn
(choose-completion first)
=== modified file 'lisp/term/xterm.el'
--- a/lisp/term/xterm.el 2014-04-17 07:54:23 +0000
+++ b/lisp/term/xterm.el 2014-04-25 16:11:07 +0000
@@ -530,6 +530,12 @@
;; Since xterm-280, the terminal type (NUMBER1) is now 41 instead of 0.
(when (string-match "\\([0-9]+\\);\\([0-9]+\\);0" str)
(let ((version (string-to-number (match-string 2 str))))
+ (when (and (> version 2000) (equal (match-string 1 str) "1"))
+ ;; Hack attack! bug#16988: gnome-terminal reports "1;NNNN;0"
+ ;; with a large NNNN but is based on a rather old xterm code.
+ ;; Gnome terminal 3.6.1 reports 1;3406;0
+ ;; Gnome terminal 2.32.1 reports 1;2802;0
+ (setq version 200))
;; If version is 242 or higher, assume the xterm supports
;; reporting the background color (TODO: maybe earlier
;; versions do too...)
=== modified file 'lisp/tooltip.el'
--- a/lisp/tooltip.el 2014-01-01 07:43:34 +0000
+++ b/lisp/tooltip.el 2014-04-24 15:02:56 +0000
@@ -343,10 +343,10 @@
((stringp help)
(setq help (replace-regexp-in-string "\n" ", " help))
(unless (or tooltip-previous-message
- (string-equal help (current-message))
+ (equal-including-properties help (current-message))
(and (stringp tooltip-help-message)
- (string-equal tooltip-help-message
- (current-message))))
+ (equal-including-properties tooltip-help-message
+ (current-message))))
(setq tooltip-previous-message (current-message)))
(setq tooltip-help-message help)
(let ((message-truncate-lines t)
@@ -369,7 +369,7 @@
;; Cancel display. This also cancels a delayed tip, if
;; there is one.
(tooltip-hide))
- ((equal previous-help msg)
+ ((equal-including-properties previous-help msg)
;; Same help as before (but possibly the mouse has moved).
;; Keep what we have.
)
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-04-24 03:59:19 +0000
+++ b/src/ChangeLog 2014-04-25 16:11:07 +0000
@@ -1,3 +1,9 @@
+2014-04-25 Eli Zaretskii <address@hidden>
+
+ * search.c (Fnewline_cache_check): Don't try to count newlines
+ outside the buffer's restriction, as find_newline doesn't support
+ that.
+
2014-04-24 Stefan Monnier <address@hidden>
* window.c (Fset_window_configuration): Deactivate the mark before
=== modified file 'src/search.c'
--- a/src/search.c 2014-04-22 21:32:51 +0000
+++ b/src/search.c 2014-04-25 16:11:07 +0000
@@ -3199,7 +3199,7 @@
the buffer. If the buffer doesn't have a cache, the value is nil. */)
(Lisp_Object buffer)
{
- struct buffer *buf;
+ struct buffer *buf, *old = NULL;
ptrdiff_t shortage, nl_count_cache, nl_count_buf;
Lisp_Object cache_newlines, buf_newlines, val;
ptrdiff_t from, found, i;
@@ -3210,6 +3210,7 @@
{
CHECK_BUFFER (buffer);
buf = XBUFFER (buffer);
+ old = current_buffer;
}
if (buf->base_buffer)
buf = buf->base_buffer;
@@ -3219,46 +3220,63 @@
|| buf->newline_cache == NULL)
return Qnil;
+ /* find_newline can only work on the current buffer. */
+ if (old != NULL)
+ set_buffer_internal_1 (buf);
+
/* How many newlines are there according to the cache? */
- find_newline (BUF_BEG (buf), BUF_BEG_BYTE (buf),
- BUF_Z (buf), BUF_Z_BYTE (buf),
+ find_newline (BEGV, BEGV_BYTE, ZV, ZV_BYTE,
TYPE_MAXIMUM (ptrdiff_t), &shortage, NULL, true);
nl_count_cache = TYPE_MAXIMUM (ptrdiff_t) - shortage;
/* Create vector and populate it. */
cache_newlines = make_uninit_vector (nl_count_cache);
- for (from = BUF_BEG( buf), found = from, i = 0;
- from < BUF_Z (buf);
- from = found, i++)
+
+ if (nl_count_cache)
{
- ptrdiff_t from_byte = CHAR_TO_BYTE (from);
+ for (from = BEGV, found = from, i = 0; from < ZV; from = found, i++)
+ {
+ ptrdiff_t from_byte = CHAR_TO_BYTE (from);
- found = find_newline (from, from_byte, 0, -1, 1, &shortage, NULL, true);
- if (shortage == 0)
- ASET (cache_newlines, i, make_number (found - 1));
+ found = find_newline (from, from_byte, 0, -1, 1, &shortage,
+ NULL, true);
+ if (shortage != 0 || i >= nl_count_cache)
+ break;
+ ASET (cache_newlines, i, make_number (found - 1));
+ }
+ /* Fill the rest of slots with an invalid position. */
+ for ( ; i < nl_count_cache; i++)
+ ASET (cache_newlines, i, make_number (-1));
}
/* Now do the same, but without using the cache. */
- find_newline1 (BUF_BEG (buf), BUF_BEG_BYTE (buf),
- BUF_Z (buf), BUF_Z_BYTE (buf),
+ find_newline1 (BEGV, BEGV_BYTE, ZV, ZV_BYTE,
TYPE_MAXIMUM (ptrdiff_t), &shortage, NULL, true);
nl_count_buf = TYPE_MAXIMUM (ptrdiff_t) - shortage;
buf_newlines = make_uninit_vector (nl_count_buf);
- for (from = BUF_BEG( buf), found = from, i = 0;
- from < BUF_Z (buf);
- from = found, i++)
+ if (nl_count_buf)
{
- ptrdiff_t from_byte = CHAR_TO_BYTE (from);
+ for (from = BEGV, found = from, i = 0; from < ZV; from = found, i++)
+ {
+ ptrdiff_t from_byte = CHAR_TO_BYTE (from);
- found = find_newline1 (from, from_byte, 0, -1, 1, &shortage, NULL, true);
- if (shortage == 0)
- ASET (buf_newlines, i, make_number (found - 1));
+ found = find_newline1 (from, from_byte, 0, -1, 1, &shortage,
+ NULL, true);
+ if (shortage != 0 || i >= nl_count_buf)
+ break;
+ ASET (buf_newlines, i, make_number (found - 1));
+ }
+ for ( ; i < nl_count_buf; i++)
+ ASET (buf_newlines, i, make_number (-1));
}
/* Construct the value and return it. */
val = make_uninit_vector (2);
ASET (val, 0, cache_newlines);
ASET (val, 1, buf_newlines);
+
+ if (old != NULL)
+ set_buffer_internal_1 (old);
return val;
}
=== modified file 'test/ChangeLog'
--- a/test/ChangeLog 2014-04-22 21:32:51 +0000
+++ b/test/ChangeLog 2014-04-25 16:11:07 +0000
@@ -1,3 +1,17 @@
+2014-04-25 Michael Albinus <address@hidden>
+
+ * automated/tramp-tests.el (top):
+ * automated/file-notify-tests.el (top): Do not disable interactive
+ passwords in batch mode.
+ (password-cache-expiry): Set to nil.
+
+ * automated/file-notify-tests.el
+ (file-notify-test-remote-temporary-file-directory):
+ * automated/tramp-tests.el (tramp-test-temporary-file-directory):
+ Use a mock-up method as default.
+ (tramp-test00-availability): Print the used directory name.
+ (tramp-test33-recursive-load): Fix typo.
+
2014-04-22 Michael Albinus <address@hidden>
* automated/tramp-tests.el (tramp--test-check-files): Remove traces.
=== modified file 'test/automated/file-notify-tests.el'
--- a/test/automated/file-notify-tests.el 2014-02-04 11:41:20 +0000
+++ b/test/automated/file-notify-tests.el 2014-04-25 10:35:01 +0000
@@ -19,15 +19,17 @@
;;; Commentary:
-;; Some of the tests require access to a remote host files. Set
-;; $REMOTE_TEMPORARY_FILE_DIRECTORY to a suitable value in order
-;; to overwrite the default value. If you want to skip tests
-;; accessing a remote host, set this environment variable to
-;; "/dev/null" or whatever is appropriate on your system.
+;; Some of the tests require access to a remote host files. Since
+;; this could be problematic, a mock-up connection method "mock" is
+;; used. Emulating a remote connection, it simply calls "sh -i".
+;; Tramp's file name handlers still run, so this test is sufficient
+;; except for connection establishing.
-;; When running the tests in batch mode, it must NOT require an
-;; interactive password prompt unless the environment variable
-;; $REMOTE_ALLOW_PASSWORD is set.
+;; If you want to test a real Tramp connection, set
+;; $REMOTE_TEMPORARY_FILE_DIRECTORY to a suitable value in order to
+;; overwrite the default value. If you want to skip tests accessing a
+;; remote host, set this environment variable to "/dev/null" or
+;; whatever is appropriate on your system.
;; A whole test run can be performed calling the command
`file-notify-test-all'.
@@ -35,13 +37,22 @@
(require 'ert)
(require 'filenotify)
+(require 'tramp)
;; There is no default value on w32 systems, which could work out of the box.
(defconst file-notify-test-remote-temporary-file-directory
(cond
((getenv "REMOTE_TEMPORARY_FILE_DIRECTORY"))
((eq system-type 'windows-nt) null-device)
- (t (format "/ssh::%s" temporary-file-directory)))
+ (t (add-to-list
+ 'tramp-methods
+ '("mock"
+ (tramp-login-program "sh")
+ (tramp-login-args (("-i")))
+ (tramp-remote-shell "/bin/sh")
+ (tramp-remote-shell-args ("-c"))
+ (tramp-connection-timeout 10)))
+ (format "/mock::%s" temporary-file-directory)))
"Temporary directory for Tramp tests.")
(defvar file-notify--test-tmpfile nil)
@@ -49,14 +60,10 @@
(defvar file-notify--test-results nil)
(defvar file-notify--test-event nil)
-(require 'tramp)
-(setq tramp-verbose 0
+(setq password-cache-expiry nil
+ tramp-verbose 0
tramp-message-show-message nil)
-;; Disable interactive passwords in batch mode.
-(when (and noninteractive (not (getenv "REMOTE_ALLOW_PASSWORD")))
- (defalias 'tramp-read-passwd 'ignore))
-
;; This shall happen on hydra only.
(when (getenv "NIX_STORE")
(add-to-list 'tramp-remote-path 'tramp-own-remote-path))
=== modified file 'test/automated/tramp-tests.el'
--- a/test/automated/tramp-tests.el 2014-04-22 10:52:08 +0000
+++ b/test/automated/tramp-tests.el 2014-04-25 10:35:01 +0000
@@ -21,15 +21,17 @@
;; The tests require a recent ert.el from Emacs 24.4.
-;; Some of the tests require access to a remote host files. Set
-;; $REMOTE_TEMPORARY_FILE_DIRECTORY to a suitable value in order
-;; to overwrite the default value. If you want to skip tests
-;; accessing a remote host, set this environment variable to
-;; "/dev/null" or whatever is appropriate on your system.
+;; Some of the tests require access to a remote host files. Since
+;; this could be problematic, a mock-up connection method "mock" is
+;; used. Emulating a remote connection, it simply calls "sh -i".
+;; Tramp's file name handlers still run, so this test is sufficient
+;; except for connection establishing.
-;; When running the tests in batch mode, it must NOT require an
-;; interactive password prompt unless the environment variable
-;; $REMOTE_ALLOW_PASSWORD is set.
+;; If you want to test a real Tramp connection, set
+;; $REMOTE_TEMPORARY_FILE_DIRECTORY to a suitable value in order to
+;; overwrite the default value. If you want to skip tests accessing a
+;; remote host, set this environment variable to "/dev/null" or
+;; whatever is appropriate on your system.
;; A whole test run can be performed calling the command `tramp-test-all'.
@@ -51,7 +53,15 @@
(cond
((getenv "REMOTE_TEMPORARY_FILE_DIRECTORY"))
((eq system-type 'windows-nt) null-device)
- (t (format "/ssh::%s" temporary-file-directory)))
+ (t (add-to-list
+ 'tramp-methods
+ '("mock"
+ (tramp-login-program "sh")
+ (tramp-login-args (("-i")))
+ (tramp-remote-shell "/bin/sh")
+ (tramp-remote-shell-args ("-c"))
+ (tramp-connection-timeout 10)))
+ (format "/mock::%s" temporary-file-directory)))
"Temporary directory for Tramp tests.")
(setq password-cache-expiry nil
@@ -59,10 +69,6 @@
tramp-copy-size-limit nil
tramp-message-show-message nil)
-;; Disable interactive passwords in batch mode.
-(when (and noninteractive (not (getenv "REMOTE_ALLOW_PASSWORD")))
- (defalias 'tramp-read-passwd 'ignore))
-
;; This shall happen on hydra only.
(when (getenv "NIX_STORE")
(add-to-list 'tramp-remote-path 'tramp-own-remote-path))
@@ -127,6 +133,7 @@
(ert-deftest tramp-test00-availability ()
"Test availability of Tramp functions."
:expected-result (if (tramp--test-enabled) :passed :failed)
+ (message "Remote directory: `%s'" tramp-test-temporary-file-directory)
(should (ignore-errors
(and
(file-remote-p tramp-test-temporary-file-directory)
@@ -1589,7 +1596,7 @@
(dolist (code
(list
(format
- "(expand-file-name %S))"
+ "(expand-file-name %S)"
tramp-test-temporary-file-directory)
(format
"(let ((default-directory %S)) (expand-file-name %S))"
=== modified file 'test/indent/perl.perl'
--- a/test/indent/perl.perl 2014-04-03 00:41:09 +0000
+++ b/test/indent/perl.perl 2014-04-23 01:56:18 +0000
@@ -1,6 +1,8 @@
#!/usr/bin/perl
# -*- eval: (bug-reference-mode 1) -*-
+if ($c && /====/){xyz;}
+
print <<"EOF1" . s/he"llo/th'ere/;
foo
EOF2
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117023: Merge from emacs-24; up to r117019,
Juanma Barranquero <=