Now on revision 112379. ------------------------------------------------------------ revno: 112379 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14218 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2013-04-24 23:25:34 -0400 message: * lisp/progmodes/octave-mod.el (octave-smie-forward-token): Only emit semi-colons if the line is not otherwise empty. * lisp/emacs-lisp/smie.el (smie-indent--hanging-p): Don't burp at EOB. (smie-indent-keyword): Improve the check to ensure that the next comment is really on the same line. (smie-indent-comment): Don't align with a subsequent closer (or eob). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-25 00:53:18 +0000 +++ lisp/ChangeLog 2013-04-25 03:25:34 +0000 @@ -1,3 +1,13 @@ +2013-04-25 Stefan Monnier + + * emacs-lisp/smie.el (smie-indent--hanging-p): Don't burp at EOB. + (smie-indent-keyword): Improve the check to ensure that the next + comment is really on the same line. + (smie-indent-comment): Don't align with a subsequent closer (or eob). + + * progmodes/octave-mod.el (octave-smie-forward-token): Only emit + semi-colons if the line is not otherwise empty (bug#14218). + 2013-04-25 Glenn Morris * vc/vc-bzr.el (vc-bzr-print-log): Tweak LIMIT = 1 case. === modified file 'lisp/emacs-lisp/smie.el' --- lisp/emacs-lisp/smie.el 2013-03-14 14:48:03 +0000 +++ lisp/emacs-lisp/smie.el 2013-04-25 03:25:34 +0000 @@ -1067,9 +1067,10 @@ (save-excursion (<= (line-end-position) (progn - (when (zerop (length (funcall smie-forward-token-function))) - ;; Could be an open-paren. - (forward-char 1)) + (and (zerop (length (funcall smie-forward-token-function))) + (not (eobp)) + ;; Could be an open-paren. + (forward-char 1)) (skip-chars-forward " \t") (or (eolp) (and (looking-at comment-start-skip) @@ -1350,8 +1351,11 @@ (if (and (< pos (line-beginning-position)) ;; Make sure `token' also *starts* on another line. (save-excursion - (smie-indent-backward-token) - (< pos (line-beginning-position)))) + (let ((endpos (point))) + (goto-char pos) + (forward-line 1) + (and (equal res (smie-indent-forward-token)) + (eq (point) endpos))))) nil (goto-char pos) res))))) @@ -1473,13 +1477,21 @@ (save-excursion (forward-comment (point-max)) (skip-chars-forward " \t\r\n") - ;; FIXME: We assume here that smie-indent-calculate will compute the - ;; indentation of the next token based on text before the comment, but - ;; this is not guaranteed, so maybe we should let - ;; smie-indent-calculate return some info about which buffer position - ;; was used as the "indentation base" and check that this base is - ;; before `pos'. - (smie-indent-calculate)))) + (unless + ;; Don't align with a closer, since the comment is "within" the + ;; closed element. Don't align with EOB either. + (save-excursion + (let ((next (funcall smie-forward-token-function))) + (or (if (zerop (length next)) + (or (eobp) (eq (car (syntax-after (point))) 5))) + (rassoc next smie-closer-alist)))) + ;; FIXME: We assume here that smie-indent-calculate will compute the + ;; indentation of the next token based on text before the comment, + ;; but this is not guaranteed, so maybe we should let + ;; smie-indent-calculate return some info about which buffer + ;; position was used as the "indentation base" and check that this + ;; base is before `pos'. + (smie-indent-calculate))))) (defun smie-indent-comment-continue () ;; indentation of comment-continue lines. === modified file 'lisp/progmodes/octave-mod.el' --- lisp/progmodes/octave-mod.el 2013-04-17 01:49:22 +0000 +++ lisp/progmodes/octave-mod.el 2013-04-25 03:25:34 +0000 @@ -482,6 +482,7 @@ (forward-comment 1)) (cond ((and (looking-at "$\\|[%#]") + (not (smie-rule-bolp)) ;; Ignore it if it's within parentheses. (prog1 (let ((ppss (syntax-ppss))) (not (and (nth 1 ppss) ------------------------------------------------------------ revno: 112378 committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-04-24 20:53:18 -0400 message: * lisp/vc/vc-bzr.el (vc-bzr-print-log): Tweak LIMIT = 1 case. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-24 20:44:45 +0000 +++ lisp/ChangeLog 2013-04-25 00:53:18 +0000 @@ -1,3 +1,7 @@ +2013-04-25 Glenn Morris + + * vc/vc-bzr.el (vc-bzr-print-log): Tweak LIMIT = 1 case. + 2013-04-24 Stefan Monnier * progmodes/opascal.el (opascal-set-token-property): Rename from === modified file 'lisp/vc/vc-bzr.el' --- lisp/vc/vc-bzr.el 2013-04-24 08:13:52 +0000 +++ lisp/vc/vc-bzr.el 2013-04-25 00:53:18 +0000 @@ -710,12 +710,28 @@ (apply 'vc-bzr-command "log" buffer 'async files (append (when shortlog '("--line")) - (when start-revision (list (format "-r..%s" start-revision))) + ;; The extra complications here when start-revision and limit + ;; are set are due to bzr log's --forward argument, which + ;; could be enabled via an alias in bazaar.conf. + ;; Svn, for example, does not have this problem, because + ;; it doesn't have --forward. Instead, you can use + ;; svn --log -r HEAD:0 or -r 0:HEAD as you prefer. + ;; Bzr, however, insists in -r X..Y that X come before Y. + (if start-revision + (list (format + (if (and limit (= limit 1)) + ;; This means we don't have to use --no-aliases. + ;; Is -c any different to -r in this case? + "-r%s" + "-r..%s") start-revision))) (when limit (list "-l" (format "%s" limit))) - ;; This is to remove --forward, if it has been added by an alias. ;; There is no sensible way to combine --limit and --forward, ;; and it breaks the meaning of START-REVISION as the ;; _newest_ revision. See bug#14168. + ;; Eg bzr log --forward -r ..100 --limit 50 prints + ;; revisions 1-50 rather than 50-100. There + ;; seems no way in general to get bzr to print revisions + ;; 50-100 in --forward order in that case. ;; FIXME There may be other alias stuff we want to keep. ;; Is there a way to just suppress --forward? ;; As of 2013/4 the only caller uses limit = 1, so it does ------------------------------------------------------------ revno: 112377 author: Andrew Cohen committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2013-04-24 22:07:21 +0000 message: lisp/gnus/nnir.el (nnir-close-group): Make sure we are in the right group diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-04-24 22:06:56 +0000 +++ lisp/gnus/ChangeLog 2013-04-24 22:07:21 +0000 @@ -1,5 +1,7 @@ 2013-04-24 Andrew Cohen + * nnir.el (nnir-close-group): Make sure we are in the right group. + * gnus-sum.el (gnus-summary-insert-articles): Force updates to the dependency table from all newly retrieved headers. === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2013-04-14 22:16:44 +0000 +++ lisp/gnus/nnir.el 2013-04-24 22:07:21 +0000 @@ -892,6 +892,7 @@ (deffoo nnir-close-group (group &optional server) + (nnir-possibly-change-group group server) (let ((pgroup (gnus-group-guess-full-name-from-command-method group))) (when (and nnir-artlist (not (gnus-ephemeral-group-p pgroup))) (gnus-group-set-parameter pgroup 'nnir-artlist nnir-artlist)) ------------------------------------------------------------ revno: 112376 author: Andrew Cohen committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2013-04-24 22:06:56 +0000 message: lisp/gnus/gnus-sum.el (gnus-summary-insert-articles): Force dependencies update with newly retrieved headers diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-04-16 06:49:46 +0000 +++ lisp/gnus/ChangeLog 2013-04-24 22:06:56 +0000 @@ -1,3 +1,8 @@ +2013-04-24 Andrew Cohen + + * gnus-sum.el (gnus-summary-insert-articles): Force updates to the + dependency table from all newly retrieved headers. + 2013-04-16 David Edmondson Support . === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2013-03-05 17:13:01 +0000 +++ lisp/gnus/gnus-sum.el 2013-04-24 22:06:56 +0000 @@ -12775,7 +12775,7 @@ (setq gnus-newsgroup-headers (gnus-merge 'list gnus-newsgroup-headers - (gnus-fetch-headers articles) + (gnus-fetch-headers articles nil t) 'gnus-article-sort-by-number)) (setq gnus-newsgroup-articles (gnus-sorted-nunion gnus-newsgroup-articles articles)) ------------------------------------------------------------ revno: 112375 committer: Paul Eggert branch nick: trunk timestamp: Wed 2013-04-24 14:02:44 -0700 message: Spelling fix. diff: === modified file 'etc/NEWS' --- etc/NEWS 2013-04-20 19:48:04 +0000 +++ etc/NEWS 2013-04-24 21:02:44 +0000 @@ -427,7 +427,7 @@ ** Changes to the Emacs Lisp Coding Conventions in Emacs 24.4 *** The package descriptor and name of global variables, constants, -and functions should be separated by two hypens if the symbol is not +and functions should be separated by two hyphens if the symbol is not meant to be used by other packages. ------------------------------------------------------------ revno: 112374 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14134 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2013-04-24 16:44:45 -0400 message: * lisp/progmodes/opascal.el (opascal-set-token-property): Rename from opascal-set-text-properties and only set `token'. (opascal-literal-text-properties): Remove. (opascal-parse-next-literal, opascal-debug-unparse-buffer): Adjust callers. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-24 14:35:59 +0000 +++ lisp/ChangeLog 2013-04-24 20:44:45 +0000 @@ -1,3 +1,12 @@ +2013-04-24 Stefan Monnier + + * progmodes/opascal.el (opascal-set-token-property): Rename from + opascal-set-text-properties and only set `token' (bug#14134). + Suggested by Erik Knowles . + (opascal-literal-text-properties): Remove. + (opascal-parse-next-literal, opascal-debug-unparse-buffer): + Adjust callers. + 2013-04-24 Reuben Thomas * textmodes/remember.el (remember-handler-functions): Add an === modified file 'lisp/progmodes/opascal.el' --- lisp/progmodes/opascal.el 2013-01-31 01:58:24 +0000 +++ lisp/progmodes/opascal.el 2013-04-24 20:44:45 +0000 @@ -406,11 +406,11 @@ non-OPascal buffer. Set to nil in OPascal buffers. To override, just do: (let ((opascal--ignore-changes t)) ...)") -(defun opascal-set-text-properties (from to properties) +(defun opascal-set-token-property (from to value) ;; Like `set-text-properties', except we do not consider this to be a buffer ;; modification. (opascal-save-state - (set-text-properties from to properties))) + (put-text-property from to 'token value))) (defun opascal-literal-kind (p) ;; Returns the literal kind the point p is in (or nil if not in a literal). @@ -490,13 +490,6 @@ (re-search-forward pattern limit 'goto-limit-on-fail) (point)))) -(defun opascal-literal-text-properties (kind) - ;; Creates a list of text properties for the literal kind. - (if (and (boundp 'font-lock-mode) - font-lock-mode) - (list 'token kind 'face (opascal-face-of kind) 'lazy-lock t) - (list 'token kind))) - (defun opascal-parse-next-literal (limit) ;; Searches for the next literal region (i.e. comment or string) and sets the ;; the point to its end (or the limit, if not found). The literal region is @@ -507,8 +500,7 @@ ;; We are completing an incomplete literal. (let ((kind (opascal-literal-kind (1- search-start)))) (opascal-complete-literal kind limit) - (opascal-set-text-properties - search-start (point) (opascal-literal-text-properties kind)))) + (opascal-set-token-property search-start (point) kind))) ((re-search-forward "\\(//\\)\\|\\({\\)\\|\\((\\*\\)\\|\\('\\)\\|\\(\"\\)" @@ -520,13 +512,12 @@ ((match-beginning 4) 'string) ((match-beginning 5) 'double-quoted-string))) (start (match-beginning 0))) - (opascal-set-text-properties search-start start nil) + (opascal-set-token-property search-start start nil) (opascal-complete-literal kind limit) - (opascal-set-text-properties - start (point) (opascal-literal-text-properties kind)))) + (opascal-set-token-property start (point) kind))) ;; Nothing found. Mark it as a non-literal. - ((opascal-set-text-properties search-start limit nil))) + ((opascal-set-token-property search-start limit nil))) (opascal-step-progress (point) "Parsing" opascal-parsing-progress-step))) (defun opascal-literal-token-at (p) @@ -1570,7 +1561,7 @@ (defun opascal-debug-unparse-buffer () (interactive) - (opascal-set-text-properties (point-min) (point-max) nil)) + (opascal-set-token-property (point-min) (point-max) nil)) (defun opascal-debug-parse-region (from to) (interactive "r") ------------------------------------------------------------ revno: 112373 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2013-04-24 22:06:20 +0300 message: Fix "make info" in doc/lispintro on MS-Windows. doc/lispintro/makefile.w32-in (INFO_OPTS): Add "-I$(emacsdir)" to fix last commit. diff: === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2013-04-24 00:58:23 +0000 +++ doc/lispintro/ChangeLog 2013-04-24 19:06:20 +0000 @@ -1,3 +1,8 @@ +2013-04-24 Eli Zaretskii + + * makefile.w32-in (INFO_OPTS): Add "-I$(emacsdir)" to fix last + commit. + 2013-04-24 Glenn Morris * emacs-lisp-intro.texi (emacsver.texi): Include it. === modified file 'doc/lispintro/makefile.w32-in' --- doc/lispintro/makefile.w32-in 2013-04-24 00:58:23 +0000 +++ doc/lispintro/makefile.w32-in 2013-04-24 19:06:20 +0000 @@ -27,7 +27,7 @@ emacsdir = $(srcdir)/../emacs INFO_EXT=.info -INFO_OPTS=--no-split +INFO_OPTS=--no-split -I$(emacsdir) INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi $(emacsdir)/emacsver.texi \ $(srcdir)/doclicense.texi # The file name eintr must fit within 5 characters, to allow for ------------------------------------------------------------ revno: 112372 committer: Tassilo Horn branch nick: trunk timestamp: Wed 2013-04-24 18:50:14 +0200 message: * themes/tsdh-dark-theme.el (tsdh-dark): Add ido faces and remove :box from outline faces. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2013-04-18 02:20:12 +0000 +++ etc/ChangeLog 2013-04-24 16:50:14 +0000 @@ -1,3 +1,8 @@ +2013-04-24 Tassilo Horn + + * themes/tsdh-dark-theme.el (tsdh-dark): Add ido faces and remove + :box from outline faces. + 2013-04-18 Leo Liu * NEWS: Mention new key ? for describe-prefix-bindings. === modified file 'etc/themes/tsdh-dark-theme.el' --- etc/themes/tsdh-dark-theme.el 2013-04-09 19:18:53 +0000 +++ etc/themes/tsdh-dark-theme.el 2013-04-24 16:50:14 +0000 @@ -65,6 +65,9 @@ '(hl-line ((t (:background "grey25")))) '(hl-paren-face ((t (:weight bold))) t) '(icomplete-first-match ((t (:foreground "deep sky blue" :weight bold)))) + '(ido-first-match ((t (:foreground "turquoise" :weight bold)))) + '(ido-only-match ((t (:foreground "medium spring green" :weight bold)))) + '(ido-subdir ((t (:inherit dired-directory :weight normal)))) '(lusty-file-face ((t (:foreground "SpringGreen1"))) t) '(magit-header ((t (:box 1 :weight bold)))) '(magit-section-title ((t (:inherit magit-header :background "dark slate blue")))) @@ -95,14 +98,14 @@ '(org-scheduled-previously ((t (:foreground "#FF7400")))) '(org-tag ((t (:weight bold)))) '(org-todo ((t (:foreground "#FF6961" :weight bold)))) - '(outline-1 ((t (:foreground "cyan1" :box (:line-width 1 :color "gainsboro") :weight bold)))) - '(outline-2 ((t (:foreground "SeaGreen1" :box (:line-width 1 :color "gainsboro") :weight bold)))) - '(outline-3 ((t (:foreground "cyan3" :box (:line-width 1 :color "gainsboro") :weight bold)))) - '(outline-4 ((t (:foreground "SeaGreen3" :box (:line-width 1 :color "gainsboro") :weight bold)))) - '(outline-5 ((t (:foreground "LightGoldenrod1" :box (:line-width 1 :color "gainsboro") :weight bold)))) - '(outline-6 ((t (:foreground "light salmon" :box (:line-width 1 :color "gainsboro") :weight bold)))) - '(outline-7 ((t (:foreground "pale goldenrod" :box (:line-width 1 :color "gainsboro") :weight bold)))) - '(outline-8 ((t (:foreground "OliveDrab1" :box (:line-width 1 :color "gainsboro") :weight bold)))) + '(outline-1 ((t (:foreground "cyan1" :weight bold)))) + '(outline-2 ((t (:foreground "SeaGreen1" :weight bold)))) + '(outline-3 ((t (:foreground "cyan3" :weight bold)))) + '(outline-4 ((t (:foreground "SeaGreen3" :weight bold)))) + '(outline-5 ((t (:foreground "LightGoldenrod1" :weight bold)))) + '(outline-6 ((t (:foreground "light salmon" :weight bold)))) + '(outline-7 ((t (:foreground "pale goldenrod" :weight bold)))) + '(outline-8 ((t (:foreground "OliveDrab1" :weight bold)))) '(rcirc-my-nick ((t (:foreground "SpringGreen1" :weight bold))) t) '(rcirc-other-nick ((t (:foreground "dodger blue"))) t) '(rcirc-track-keyword ((t (:foreground "DodgerBlue" :weight bold))) t) ------------------------------------------------------------ revno: 112371 [merge] committer: K. Handa branch nick: trunk timestamp: Thu 2013-04-25 00:11:45 +0900 message: coding.c (decode_coding_iso_2022): When an invalid escape sequence is encountered, reset the invocation and designation status to the safest one. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-04-22 05:18:30 +0000 +++ src/ChangeLog 2013-04-24 15:09:49 +0000 @@ -1,3 +1,9 @@ +2013-04-24 Kenichi Handa + + * coding.c (decode_coding_iso_2022): When an invalid escape + sequence is encountered, reset the invocation and designation + status to the safest one. + 2013-04-22 Paul Eggert * Makefile.in (bootstrap-clean): Remove stamp-h1 too. === modified file 'src/coding.c' --- src/coding.c 2013-04-06 07:33:18 +0000 +++ src/coding.c 2013-04-24 15:09:49 +0000 @@ -3887,6 +3887,14 @@ *charbuf++ = c < 0 ? -c : ASCII_BYTE_P (c) ? c : BYTE8_TO_CHAR (c); char_offset++; coding->errors++; + /* Reset the invocation and designation status to the safest + one; i.e. designate ASCII to the graphic register 0, and + invoke that register to the graphic plane 0. This typically + helps the case that an designation sequence for ASCII "ESC ( + B" is somehow broken (e.g. broken by a newline). */ + CODING_ISO_INVOCATION (coding, 0) = 0; + CODING_ISO_DESIGNATION (coding, 0) = charset_ascii; + charset_id_0 = charset_ascii; continue; break_loop: ------------------------------------------------------------ revno: 112370 committer: Bastien Guerry branch nick: trunk timestamp: Wed 2013-04-24 16:35:59 +0200 message: * textmodes/remember.el (remember-handler-functions): Add an option for a new handler `remember-store-in-files'. (remember-data-directory, remember-directory-file-name-format): New options. (remember-store-in-files): New function to store remember notes as separate files within a directory. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-24 13:50:22 +0000 +++ lisp/ChangeLog 2013-04-24 14:35:59 +0000 @@ -1,3 +1,12 @@ +2013-04-24 Reuben Thomas + + * textmodes/remember.el (remember-handler-functions): Add an + option for a new handler `remember-store-in-files'. + (remember-data-directory, remember-directory-file-name-format): + New options. + (remember-store-in-files): New function to store remember notes + as separate files within a directory. + 2013-04-24 Magnus Henoch * progmodes/compile.el (compilation-next-error-function): === modified file 'lisp/textmodes/remember.el' --- lisp/textmodes/remember.el 2013-03-12 02:08:21 +0000 +++ lisp/textmodes/remember.el 2013-04-24 14:35:59 +0000 @@ -216,10 +216,11 @@ Each function is called with the current buffer narrowed to what the user wants remembered. If any function returns non-nil, the data is assumed to have been -recorded somewhere by that function. " +recorded somewhere by that function." :type 'hook :options '(remember-store-in-mailbox remember-append-to-file + remember-store-in-files remember-diary-extract-entries org-remember-handler) :group 'remember) @@ -429,6 +430,27 @@ (run-hook-with-args-until-success 'remember-handler-functions)) (remember-destroy)))) +(defcustom remember-data-directory "~/remember" + "The directory in which to store remember data as files." + :type 'file + :group 'remember) + +(defcustom remember-directory-file-name-format "%Y-%m-%d_%T-%z" + "Format string for the file name in which to store unprocessed data." + :type 'file + :group 'remember) + +(defun remember-store-in-files () + "Store remember data in a file in `remember-data-directory'. +The file is named after `remember-directory-file-name-format'." + (let ((name (format-time-string + remember-directory-file-name-format (current-time))) + (text (buffer-string))) + (with-temp-buffer + (insert text) + (write-file (convert-standard-filename + (format "%s/%s" remember-data-directory name)))))) + ;;;###autoload (defun remember-clipboard () "Remember the contents of the current clipboard. ------------------------------------------------------------ revno: 112369 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11777 author: Magnus Henoch committer: Stefan Monnier branch nick: trunk timestamp: Wed 2013-04-24 09:50:22 -0400 message: * lisp/progmodes/compile.el (compilation-next-error-function): Pass "formats" to compilation-find-file. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-24 08:13:52 +0000 +++ lisp/ChangeLog 2013-04-24 13:50:22 +0000 @@ -1,3 +1,8 @@ +2013-04-24 Magnus Henoch + + * progmodes/compile.el (compilation-next-error-function): + Pass "formats" to compilation-find-file (bug#11777). + 2013-04-24 Glenn Morris * vc/vc-bzr.el (vc-bzr-print-log): @@ -22,12 +27,12 @@ 2013-04-23 Tassilo Horn - * textmodes/reftex-vars.el (reftex-label-regexps): Call - `reftex-compile-variables' after changes to this variable. + * textmodes/reftex-vars.el (reftex-label-regexps): + Call `reftex-compile-variables' after changes to this variable. 2013-04-23 Stefan Monnier - * jit-lock.el: Fix signals in jit-lock-force-redisplay. + * jit-lock.el: Fix signals in jit-lock-force-redisplay (bug#13542). Use lexical-binding. (jit-lock-force-redisplay): Use markers, check buffer's continued existence and beware narrowed buffers. === modified file 'lisp/progmodes/compile.el' --- lisp/progmodes/compile.el 2013-03-19 00:16:14 +0000 +++ lisp/progmodes/compile.el 2013-04-24 13:50:22 +0000 @@ -2382,10 +2382,12 @@ ;; (setq timestamp compilation-buffer-modtime))) ) (with-current-buffer - (compilation-find-file - marker - (caar (compilation--loc->file-struct loc)) - (cadr (car (compilation--loc->file-struct loc)))) + (apply #'compilation-find-file + marker + (caar (compilation--loc->file-struct loc)) + (cadr (car (compilation--loc->file-struct loc))) + (compilation--file-struct->formats + (compilation--loc->file-struct loc))) (let ((screen-columns ;; Obey the compilation-error-screen-columns of the target ;; buffer if its major mode set it buffer-locally. ------------------------------------------------------------ revno: 112368 fixes bug: http://debbugs.gnu.org/14168 committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-04-24 01:13:52 -0700 message: * vc/vc-bzr.el (vc-bzr-print-log): Improve START-REVISION with LIMIT != 1. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-24 07:59:29 +0000 +++ lisp/ChangeLog 2013-04-24 08:13:52 +0000 @@ -1,5 +1,6 @@ 2013-04-24 Glenn Morris + * vc/vc-bzr.el (vc-bzr-print-log): * vc/vc-hg.el (vc-hg-print-log): * vc/vc-svn.el (vc-svn-print-log): Fix START-REVISION with LIMIT != 1. (Bug#14168) === modified file 'lisp/vc/vc-bzr.el' --- lisp/vc/vc-bzr.el 2013-04-24 07:52:00 +0000 +++ lisp/vc/vc-bzr.el 2013-04-24 08:13:52 +0000 @@ -712,6 +712,15 @@ (when shortlog '("--line")) (when start-revision (list (format "-r..%s" start-revision))) (when limit (list "-l" (format "%s" limit))) + ;; This is to remove --forward, if it has been added by an alias. + ;; There is no sensible way to combine --limit and --forward, + ;; and it breaks the meaning of START-REVISION as the + ;; _newest_ revision. See bug#14168. + ;; FIXME There may be other alias stuff we want to keep. + ;; Is there a way to just suppress --forward? + ;; As of 2013/4 the only caller uses limit = 1, so it does + ;; not matter much. + (and start-revision limit (> limit 1) '("--no-aliases")) (if (stringp vc-bzr-log-switches) (list vc-bzr-log-switches) vc-bzr-log-switches))))) ------------------------------------------------------------ revno: 112367 fixes bug: http://debbugs.gnu.org/14168 committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-04-24 00:59:29 -0700 message: vc-hg, vc-svn print-log fixes for start-revision with limit != 1 * vc/vc-hg.el (vc-hg-print-log): * vc/vc-svn.el (vc-svn-print-log): Fix START-REVISION with LIMIT != 1. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-24 07:52:00 +0000 +++ lisp/ChangeLog 2013-04-24 07:59:29 +0000 @@ -1,5 +1,9 @@ 2013-04-24 Glenn Morris + * vc/vc-hg.el (vc-hg-print-log): + * vc/vc-svn.el (vc-svn-print-log): + Fix START-REVISION with LIMIT != 1. (Bug#14168) + * vc/vc-bzr.el (vc-bzr-print-log): * vc/vc-cvs.el (vc-cvs-print-log): * vc/vc-git.el (vc-git-print-log): === modified file 'lisp/vc/vc-hg.el' --- lisp/vc/vc-hg.el 2013-04-24 07:52:00 +0000 +++ lisp/vc/vc-hg.el 2013-04-24 07:59:29 +0000 @@ -260,7 +260,7 @@ buffer (apply 'vc-hg-command buffer 0 files "log" (nconc - (when start-revision (list (format "-r%s:" start-revision))) + (when start-revision (list (format "-r%s:0" start-revision))) (when limit (list "-l" (format "%s" limit))) (when shortlog (list "--template" (car vc-hg-root-log-format))) vc-hg-log-switches))))) === modified file 'lisp/vc/vc-svn.el' --- lisp/vc/vc-svn.el 2013-04-24 07:52:00 +0000 +++ lisp/vc/vc-svn.el 2013-04-24 07:59:29 +0000 @@ -515,7 +515,7 @@ (append (list (if start-revision - (format "-r%s" start-revision) + (format "-r%s:1" start-revision) ;; By default Subversion only shows the log up to the ;; working revision, whereas we also want the log of the ;; subsequent commits. At least that's what the ------------------------------------------------------------ revno: 112366 committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-04-24 00:52:00 -0700 message: Doc fixes related to vc-print-log * vc/vc-bzr.el (vc-bzr-print-log): * vc/vc-cvs.el (vc-cvs-print-log): * vc/vc-git.el (vc-git-print-log): * vc/vc-hg.el (vc-hg-print-log): * vc/vc-mtn.el (vc-mtn-print-log): * vc/vc-rcs.el (vc-rcs-print-log): * vc/vc-sccs.el (vc-sccs-print-log): * vc/vc-svn.el (vc-svn-print-log): * vc/vc.el (vc-print-log-internal): Doc fixes. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-23 21:51:40 +0000 +++ lisp/ChangeLog 2013-04-24 07:52:00 +0000 @@ -1,3 +1,15 @@ +2013-04-24 Glenn Morris + + * vc/vc-bzr.el (vc-bzr-print-log): + * vc/vc-cvs.el (vc-cvs-print-log): + * vc/vc-git.el (vc-git-print-log): + * vc/vc-hg.el (vc-hg-print-log): + * vc/vc-mtn.el (vc-mtn-print-log): + * vc/vc-rcs.el (vc-rcs-print-log): + * vc/vc-sccs.el (vc-sccs-print-log): + * vc/vc-svn.el (vc-svn-print-log): + * vc/vc.el (vc-print-log-internal): Doc fixes. + 2013-04-23 Glenn Morris * startup.el (normal-no-mouse-startup-screen, normal-about-screen): === modified file 'lisp/vc/vc-bzr.el' --- lisp/vc/vc-bzr.el 2013-03-28 03:26:37 +0000 +++ lisp/vc/vc-bzr.el 2013-04-24 07:52:00 +0000 @@ -694,7 +694,10 @@ ("^ *timestamp: \\(.*\\)" (1 'change-log-date-face))))))) (defun vc-bzr-print-log (files buffer &optional shortlog start-revision limit) - "Get bzr change log for FILES into specified BUFFER." + "Print commit log associated with FILES into specified BUFFER. +If SHORTLOG is non-nil, use --line format. +If START-REVISION is non-nil, it is the newest revision to show. +If LIMIT is non-nil, show no more than this many entries." ;; `vc-do-command' creates the buffer, but we need it before running ;; the command. (vc-setup-buffer buffer) === modified file 'lisp/vc/vc-cvs.el' --- lisp/vc/vc-cvs.el 2013-04-20 16:24:04 +0000 +++ lisp/vc/vc-cvs.el 2013-04-24 07:52:00 +0000 @@ -503,7 +503,8 @@ (declare-function vc-rcs-print-log-cleanup "vc-rcs" ()) (defun vc-cvs-print-log (files buffer &optional _shortlog _start-revision limit) - "Get change logs associated with FILES." + "Print commit log associated with FILES into specified BUFFER. +Remaining arguments are ignored." (require 'vc-rcs) ;; It's just the catenation of the individual logs. (vc-cvs-command === modified file 'lisp/vc/vc-git.el' --- lisp/vc/vc-git.el 2013-02-01 17:19:24 +0000 +++ lisp/vc/vc-git.el 2013-04-24 07:52:00 +0000 @@ -732,9 +732,11 @@ ;;; HISTORY FUNCTIONS (defun vc-git-print-log (files buffer &optional shortlog start-revision limit) - "Get change log associated with FILES. -Note that using SHORTLOG requires at least Git version 1.5.6, -for the --graph option." + "Print commit log associated with FILES into specified BUFFER. +If SHORTLOG is non-nil, use a short format based on `vc-git-root-log-format'. +\(This requires at least Git version 1.5.6, for the --graph option.) +If START-REVISION is non-nil, it is the newest revision to show. +If LIMIT is non-nil, show no more than this many entries." (let ((coding-system-for-read vc-git-commits-coding-system)) ;; `vc-do-command' creates the buffer, but we need it before running ;; the command. === modified file 'lisp/vc/vc-hg.el' --- lisp/vc/vc-hg.el 2013-04-17 00:50:44 +0000 +++ lisp/vc/vc-hg.el 2013-04-24 07:52:00 +0000 @@ -152,7 +152,7 @@ (2 'change-log-list) (3 'change-log-name) (4 'change-log-date))) - "Mercurial log template for `vc-print-root-log'. + "Mercurial log template for `vc-hg-print-log' short format. This should be a list (TEMPLATE REGEXP KEYWORDS), where TEMPLATE is the \"--template\" argument string to pass to Mercurial, REGEXP is a regular expression matching the resulting Mercurial @@ -246,7 +246,10 @@ :group 'vc-hg) (defun vc-hg-print-log (files buffer &optional shortlog start-revision limit) - "Get change log associated with FILES." + "Print commit log associated with FILES into specified BUFFER. +If SHORTLOG is non-nil, use a short format based on `vc-hg-root-log-format'. +If START-REVISION is non-nil, it is the newest revision to show. +If LIMIT is non-nil, show no more than this many entries." ;; `vc-do-command' creates the buffer, but we need it before running ;; the command. (vc-setup-buffer buffer) === modified file 'lisp/vc/vc-mtn.el' --- lisp/vc/vc-mtn.el 2013-02-01 17:19:24 +0000 +++ lisp/vc/vc-mtn.el 2013-04-24 07:52:00 +0000 @@ -202,6 +202,10 @@ ;; ) (defun vc-mtn-print-log (files buffer &optional _shortlog start-revision limit) + "Print commit logs associated with FILES into specified BUFFER. +_SHORTLOG is ignored. +If START-REVISION is non-nil, it is the newest revision to show. +If LIMIT is non-nil, show no more than this many entries." (apply 'vc-mtn-command buffer 0 files "log" (append (when start-revision (list "--from" (format "%s" start-revision))) === modified file 'lisp/vc/vc-rcs.el' --- lisp/vc/vc-rcs.el 2013-01-01 09:11:05 +0000 +++ lisp/vc/vc-rcs.el 2013-04-24 07:52:00 +0000 @@ -567,10 +567,14 @@ (when (looking-at "[\b\t\n\v\f\r ]+") (delete-char (- (match-end 0) (match-beginning 0)))))) -(defun vc-rcs-print-log (files buffer &optional shortlog start-revision-ignored limit) - "Get change log associated with FILE. If FILE is a -directory the operation is applied to all registered files beneath it." - (vc-do-command (or buffer "*vc*") 0 "rlog" (mapcar 'vc-name (vc-expand-dirs files))) +(defun vc-rcs-print-log (files buffer &optional shortlog + start-revision-ignored limit) + "Print commit log associated with FILES into specified BUFFER. +Remaining arguments are ignored. +If FILE is a directory the operation is applied to all registered +files beneath it." + (vc-do-command (or buffer "*vc*") 0 "rlog" + (mapcar 'vc-name (vc-expand-dirs files))) (with-current-buffer (or buffer "*vc*") (vc-rcs-print-log-cleanup)) (when limit 'limit-unsupported)) === modified file 'lisp/vc/vc-sccs.el' --- lisp/vc/vc-sccs.el 2013-01-01 09:11:05 +0000 +++ lisp/vc/vc-sccs.el 2013-04-24 07:52:00 +0000 @@ -350,7 +350,8 @@ ;;; (defun vc-sccs-print-log (files buffer &optional shortlog start-revision-ignored limit) - "Get change log associated with FILES." + "Print commit log associated with FILES into specified BUFFER. +Remaining arguments are ignored." (setq files (vc-expand-dirs files)) (vc-sccs-do-command buffer 0 "prs" (mapcar 'vc-name files)) (when limit 'limit-unsupported)) === modified file 'lisp/vc/vc-svn.el' --- lisp/vc/vc-svn.el 2013-02-11 01:07:05 +0000 +++ lisp/vc/vc-svn.el 2013-04-24 07:52:00 +0000 @@ -494,7 +494,10 @@ (set (make-local-variable 'log-view-per-file-logs) nil)) (defun vc-svn-print-log (files buffer &optional shortlog start-revision limit) - "Get change log(s) associated with FILES." + "Print commit log associated with FILES into specified BUFFER. +SHORTLOG is ignored. +If START-REVISION is non-nil, it is the newest revision to show. +If LIMIT is non-nil, show no more than this many entries." (save-current-buffer (vc-setup-buffer buffer) (let ((inhibit-read-only t)) === modified file 'lisp/vc/vc.el' --- lisp/vc/vc.el 2013-04-21 00:37:54 +0000 +++ lisp/vc/vc.el 2013-04-24 07:52:00 +0000 @@ -356,9 +356,11 @@ ;; If LIMIT is true insert only insert LIMIT log entries. If the ;; backend does not support limiting the number of entries to show ;; it should return `limit-unsupported'. -;; If START-REVISION is given, then show the log starting from the -;; revision. At this point START-REVISION is only required to work -;; in conjunction with LIMIT = 1. +;; If START-REVISION is given, then show the log starting from that +;; revision ("starting" in the sense of it being the _newest_ +;; revision shown, rather than the working revision, which is normally +;; the case). Not all backends support this. At present, this is +;; only ever used with LIMIT = 1 (by vc-annotate-show-log-revision-at-line). ;; ;; * log-outgoing (backend remote-location) ;; @@ -2111,14 +2113,11 @@ &optional is-start-revision limit) "For specified BACKEND and FILES, show the VC log. Leave point at WORKING-REVISION, if it is non-nil. -If IS-START-REVISION is non-nil, start the log from WORKING-REVISION. -Show up to LIMIT entries (non-nil means unlimited). -\(IS-START-REVISION non-nil might not work correctly if LIMIT is not 1.)" - ;; The parenthetical remark is based on the commentary of vc.el for - ;; "print log": "At this point START-REVISION is only required to work - ;; in conjunction with LIMIT = 1." The only thing that passes - ;; IS-START-REVISION non-nil is vc-annotate-show-log-revision-at-line, - ;; which sets LIMIT = 1. +If IS-START-REVISION is non-nil, start the log from WORKING-REVISION +\(not all backends support this); i.e., show only WORKING-REVISION and +earlier revisions. Show up to LIMIT entries (non-nil means unlimited)." + ;; As of 2013/04 the only thing that passes IS-START-REVISION non-nil + ;; is vc-annotate-show-log-revision-at-line, which sets LIMIT = 1. ;; Don't switch to the output buffer before running the command, ;; so that any buffer-local settings in the vc-controlled ------------------------------------------------------------ revno: 112365 committer: Glenn Morris branch nick: trunk timestamp: Tue 2013-04-23 21:09:00 -0400 message: Remove old comments about making various formats (use Makefile instead) diff: === modified file 'doc/lispintro/emacs-lisp-intro.texi' --- doc/lispintro/emacs-lisp-intro.texi 2013-04-24 00:58:23 +0000 +++ doc/lispintro/emacs-lisp-intro.texi 2013-04-24 01:09:00 +0000 @@ -41,76 +41,6 @@ @set edition-number 3.10 @set update-date 28 October 2009 -@ignore - ## Summary of shell commands to create various output formats: - - pushd /usr/local/src/emacs/lispintro/ - ## pushd /u/intro/ - - ## Info output - makeinfo --paragraph-indent=0 --verbose emacs-lisp-intro.texi - - ## ;; (progn (when (bufferp (get-buffer "*info*")) (kill-buffer "*info*")) (info "/usr/local/src/emacs/info/eintr")) - - ## DVI output - texi2dvi emacs-lisp-intro.texi - - ## xdvi -margins 24pt -topmargin 4pt -offsets 24pt -geometry 760x1140 -s 5 -useTeXpages -mousemode 1 emacs-lisp-intro.dvi & - - ## HTML output - makeinfo --html --no-split --verbose emacs-lisp-intro.texi - - ## galeon emacs-lisp-intro.html - - ## Plain text output - makeinfo --fill-column=70 --no-split --paragraph-indent=0 \ - --verbose --no-headers --output=emacs-lisp-intro.txt emacs-lisp-intro.texi - - popd - -# as user `root' -# insert thumbdrive - mtusb # mount -v -t ext3 /dev/sda /mnt - cp -v /u/intro/emacs-lisp-intro.texi /mnt/backup/intro/emacs-lisp-intro.texi - umtusb # umount -v /mnt -# remove thumbdrive - - ## Other shell commands - - pushd /usr/local/src/emacs/lispintro/ - ## pushd /u/intro/ - - ## PDF - texi2dvi --pdf emacs-lisp-intro.texi - # xpdf emacs-lisp-intro.pdf & - - ## DocBook -- note file extension - makeinfo --docbook --no-split --paragraph-indent=0 \ - --verbose --output=emacs-lisp-intro.docbook emacs-lisp-intro.texi - - ## XML with a Texinfo DTD -- note file extension - makeinfo --xml --no-split --paragraph-indent=0 \ - --verbose --output=emacs-lisp-intro.texinfoxml emacs-lisp-intro.texi - - ## PostScript (needs DVI) - # gv emacs-lisp-intro.ps & - # Create DVI if we lack it - # texi2dvi emacs-lisp-intro.texi - dvips emacs-lisp-intro.dvi -o emacs-lisp-intro.ps - - ## RTF (needs HTML) - # Use OpenOffice to view RTF - # Create HTML if we lack it - # makeinfo --no-split --html emacs-lisp-intro.texi - /usr/local/src/html2rtf.pl emacs-lisp-intro.html - - ## LaTeX (needs RTF) - /usr/bin/rtf2latex emacs-lisp-intro.rtf - - popd - -@end ignore - @c ================ Included Figures ================ @c Set print-postscript-figures if you print PostScript figures. @@ -119,25 +49,6 @@ @c Your site may require editing changes to print PostScript; in this @c case, search for `print-postscript-figures' and make appropriate changes. -@c ================ How to Create an Info file ================ - -@c If you have `makeinfo' installed, run the following command - -@c makeinfo emacs-lisp-intro.texi - -@c or, if you want a single, large Info file, and no paragraph indents: -@c makeinfo --no-split --paragraph-indent=0 --verbose emacs-lisp-intro.texi - -@c After creating the Info file, edit your Info `dir' file, if the -@c `dircategory' section below does not enable your system to -@c install the manual automatically. -@c (The `dir' file is often in the `/usr/local/share/info/' directory.) - -@c ================ How to Create an HTML file ================ - -@c To convert to HTML format -@c makeinfo --html --no-split --verbose emacs-lisp-intro.texi - @c ================ How to Print a Book in Various Sizes ================ @c This book can be printed in any of three different sizes. @@ -156,34 +67,6 @@ @c @afourpaper @c @set largebook -@c ================ How to Typeset and Print ================ - -@c If you do not include PostScript figures, run either of the -@c following command sequences, or similar commands suited to your -@c system: - -@c texi2dvi emacs-lisp-intro.texi -@c lpr -d emacs-lisp-intro.dvi - -@c or else: - -@c tex emacs-lisp-intro.texi -@c texindex emacs-lisp-intro.?? -@c tex emacs-lisp-intro.texi -@c lpr -d emacs-lisp-intro.dvi - -@c If you include the PostScript figures, and you have old software, -@c you may need to convert the .dvi file to a .ps file before -@c printing. Run either of the following command sequences, or one -@c similar: -@c -@c dvips -f < emacs-lisp-intro.dvi > emacs-lisp-intro.ps -@c -@c or else: -@c -@c postscript -p < emacs-lisp-intro.dvi > emacs-lisp-intro.ps -@c - @c (Note: if you edit the book so as to change the length of the @c table of contents, you may have to change the value of `pageno' below.) ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.