------------------------------------------------------------ revno: 117024 committer: Stefan Monnier branch nick: trunk timestamp: Fri 2014-04-25 15:22:26 -0400 message: * lisp/progmodes/perl-mode.el (perl--syntax-exp-intro-regexp): New var. (perl-syntax-propertize-function): Use it. Extend handling of here-docs to the unquoted case. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-04-25 16:11:07 +0000 +++ lisp/ChangeLog 2014-04-25 19:22:26 +0000 @@ -1,7 +1,13 @@ +2014-04-25 Stefan Monnier + + * progmodes/perl-mode.el (perl--syntax-exp-intro-regexp): New var. + (perl-syntax-propertize-function): Use it. Extend handling of + here-docs to the unquoted case. + 2014-04-25 Eli Zaretskii - * tooltip.el (tooltip-show-help-non-mode, tooltip-show-help): Use - equal-including-properties to compare help-echo strings. (Bug#17331) + * 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 === modified file 'lisp/progmodes/perl-mode.el' --- lisp/progmodes/perl-mode.el 2014-04-23 01:56:18 +0000 +++ lisp/progmodes/perl-mode.el 2014-04-25 19:22:26 +0000 @@ -66,22 +66,7 @@ ;; a rich language; writing a more suitable parser would be a big job): ;; 2) The globbing syntax is not recognized, so special ;; characters in the pattern string must be backslashed. -;; 3) The << quoting operators are not recognized; see below. -;; 5) To make '$' work correctly, $' is not recognized as a variable. -;; Use "$'" or $POSTMATCH instead. ;; -;; If you don't use font-lock, additional problems will appear: -;; 1) Regular expression delimiters do not act as quotes, so special -;; characters such as `'"#:;[](){} may need to be backslashed -;; in regular expressions and in both parts of s/// and tr///. -;; 4) The q and qq quoting operators are not recognized; see below. -;; 5) To make variables such a $' and $#array work, perl-mode treats -;; $ just like backslash, so '$' is not treated correctly. -;; 6) Unfortunately, treating $ like \ makes ${var} be treated as an -;; unmatched }. See below. -;; 7) When ' (quote) is used as a package name separator, perl-mode -;; doesn't understand, and thinks it is seeing a quoted string. - ;; Here are some ugly tricks to bypass some of these problems: the perl ;; expression /`/ (that's a back-tick) usually evaluates harmlessly, ;; but will trick perl-mode into starting a quoted string, which @@ -218,6 +203,13 @@ (defvar perl-quote-like-pairs '((?$ . ?$) (?\[ . ?\]) (?\{ . ?\}) (?\< . ?\>))) +(eval-and-compile + (defconst perl--syntax-exp-intro-regexp + (concat "\$?:\\(?:^\\|[^$@&%[:word:]]\$" + (regexp-opt '("split" "if" "unless" "until" "while" "print" + "grep" "map" "not" "or" "and" "for" "foreach")) + "\\|[-?:.,;|&+*=!~({[]\\|\$^\$\\)[ \t\n]*"))) + ;; FIXME: handle here-docs and regexps. ;; < branch nick: trunk timestamp: Fri 2014-04-25 18:11:07 +0200 message: Merge from emacs-24; up to r117019 diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-04-22 21:32:51 +0000 +++ doc/lispref/ChangeLog 2014-04-25 16:11:07 +0000 @@ -1,3 +1,9 @@ +2014-04-25 Eli Zaretskii + + * strings.texi (Text Comparison): Mention + equal-including-properties for when text properties of the strings + matter for comparison. + 2014-04-22 Eli Zaretskii * text.texi (Registers): Document register-read-with-preview. === modified file 'doc/lispref/strings.texi' --- doc/lispref/strings.texi 2014-03-18 01:19:03 +0000 +++ 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' --- lisp/ChangeLog 2014-04-24 22:37:28 +0000 +++ lisp/ChangeLog 2014-04-25 16:11:07 +0000 @@ -1,3 +1,37 @@ +2014-04-25 Eli Zaretskii + + * 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 + + * emacs-lisp/lisp-mode.el (emacs-lisp-mode-syntax-table): + Fix syntax for @. (Bug#17325) + +2014-04-25 Daniel Colascione + + * emacs-lisp/cl.el (gv): Require gv early to break eager + macro-expansion cycles. + +2014-04-25 Stefan Monnier + + * 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 Improve Scheme font-locking for (define ((foo ...) ...) ...). === modified file 'lisp/comint.el' --- lisp/comint.el 2014-03-30 19:12:57 +0000 +++ 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' --- lisp/emacs-lisp/cl.el 2014-01-01 07:43:34 +0000 +++ 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' --- lisp/emacs-lisp/lisp-mode.el 2014-04-22 17:45:43 +0000 +++ 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' --- lisp/progmodes/idlwave.el 2014-01-27 02:02:28 +0000 +++ 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' --- lisp/progmodes/perl-mode.el 2014-04-16 14:13:06 +0000 +++ 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' --- lisp/simple.el 2014-04-16 19:43:46 +0000 +++ 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 \\\\[choose-completion] in the completion list\ to select the completion near point. -Use \\\\[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' --- lisp/term.el 2014-01-22 10:29:23 +0000 +++ 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' --- lisp/term/xterm.el 2014-04-17 07:54:23 +0000 +++ 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' --- lisp/tooltip.el 2014-01-01 07:43:34 +0000 +++ 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' --- src/ChangeLog 2014-04-24 03:59:19 +0000 +++ src/ChangeLog 2014-04-25 16:11:07 +0000 @@ -1,3 +1,9 @@ +2014-04-25 Eli Zaretskii + + * 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 * window.c (Fset_window_configuration): Deactivate the mark before === modified file 'src/search.c' --- src/search.c 2014-04-22 21:32:51 +0000 +++ 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' --- test/ChangeLog 2014-04-22 21:32:51 +0000 +++ test/ChangeLog 2014-04-25 16:11:07 +0000 @@ -1,3 +1,17 @@ +2014-04-25 Michael Albinus + + * 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 * automated/tramp-tests.el (tramp--test-check-files): Remove traces. === modified file 'test/automated/file-notify-tests.el' --- test/automated/file-notify-tests.el 2014-02-04 11:41:20 +0000 +++ 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' --- test/automated/tramp-tests.el 2014-04-22 10:52:08 +0000 +++ 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' --- test/indent/perl.perl 2014-04-03 00:41:09 +0000 +++ 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 ------------------------------------------------------------ revno: 117022 committer: Thien-Thi Nguyen branch nick: master timestamp: Fri 2014-04-25 01:18:40 +0200 message: Warn against renaming git-bzr remote; nfc. * admin/notes/bzr (Using git-bzr): ...here, in subsection "remote name". diff: === modified file 'admin/notes/bzr' --- admin/notes/bzr 2014-04-17 21:20:51 +0000 +++ admin/notes/bzr 2014-04-24 23:18:40 +0000 @@ -388,3 +388,11 @@ http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg00436.html which includes a provisional patch to git-remote-bzr to do that. + +** remote name + +Although Git itself is agnostic about what names you choose for +the remote repo, it seems git-bzr is more likely to get confused. +After the clone as described above, the remote name is "origin"; +changing it is Not Recommended. [Insert 9-hour high-entropy then +mysterious bug w/ JSON parsing errors anecdote here. --ttn] ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.