auctex-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[AUCTeX-diffs] GNU AUCTeX branch, master, updated. 10de62b25842c8555cdb8


From: Tassilo Horn
Subject: [AUCTeX-diffs] GNU AUCTeX branch, master, updated. 10de62b25842c8555cdb8cad4c85c48a401033d3
Date: Tue, 04 Nov 2014 08:17:11 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU AUCTeX".

The branch, master has been updated
       via  10de62b25842c8555cdb8cad4c85c48a401033d3 (commit)
      from  3909e4c2c21330218648415a87c1d3983dfbc2a5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 10de62b25842c8555cdb8cad4c85c48a401033d3
Author: Stefan Monnier <address@hidden>
Date:   Tue Nov 4 09:16:32 2014 +0100

    Several changes suggested by byte-compiler warnings.
    
    * prv-install.el: Adjust copyright years.
    (preview-make-package-xemacs): Use insert-file-contents instead of
    insert-file.
    
    * preview.el.in (error): Declare not only at compile-time.
    (preview-expandable-string): Use explicit let instead of calling
    lambda with another lambda.
    (preview-mouse-open-eps): Use default-value of major-mode instead
    of default-major-mode.
    (preview-copy-text): Use with-current-buffer instead of
    save-excursion with set-buffer.
    (preview-parse-messages): Don't let-bind context.  Use mapc +
    funcall instead of run-hooks.  Use goto-char + forward-line
    instead of goto-line.
    
    Signed-off-by: Tassilo Horn <address@hidden>

diff --git a/preview/ChangeLog b/preview/ChangeLog
index a3d3885..b6518eb 100644
--- a/preview/ChangeLog
+++ b/preview/ChangeLog
@@ -1,3 +1,20 @@
+2014-11-04  Stefan Monnier  <address@hidden>
+
+       * prv-install.el: Adjust copyright years.
+       (preview-make-package-xemacs): Use insert-file-contents instead of
+       insert-file.
+
+       * preview.el.in (error): Declare not only at compile-time.
+       (preview-expandable-string): Use explicit let instead of calling
+       lambda with another lambda.
+       (preview-mouse-open-eps): Use default-value of major-mode instead
+       of default-major-mode.
+       (preview-copy-text): Use with-current-buffer instead of
+       save-excursion with set-buffer.
+       (preview-parse-messages): Don't let-bind context.  Use mapc +
+       funcall instead of run-hooks.  Use goto-char + forward-line
+       instead of goto-line.
+
 2014-10-29  Mosè Giordano  <address@hidden>
 
        * Version 11.88 released.
diff --git a/preview/preview.el.in b/preview/preview.el.in
index 57e056b..90ac06f 100644
--- a/preview/preview.el.in
+++ b/preview/preview.el.in
@@ -52,8 +52,8 @@ preview-latex buffers will not survive across sessions.")))
       (require 'reporter)
     (file-error (message "Missing reporter library, probably from the mail-lib 
package:
 preview-latex's bug reporting commands will probably not work.")))
-  (require 'info)
-  (defvar error))
+  (require 'info))
+(defvar error)
 
 ;; we need the compatibility macros which do _not_ get byte-compiled.
 (eval-when-compile
@@ -506,19 +506,20 @@ of a cell used for string concatenation."
    (t (error "Bad string expansion"))))
 
 (defconst preview-expandable-string
-  ((lambda (f) (funcall f (funcall f 'sexp)))
-   (lambda (x)
-     `(choice
-       string
-       (repeat :tag "Concatenate"
-       (choice
-        string
-        (cons :tag "Separated list"
-              (choice (string :tag "Separator")
-                      (symbol :tag "Indirect separator or flag"))
-              ,x)
-        (symbol :tag "Indirect variable (no separator)")))
-       (symbol :tag "Indirect variable (with separator)"))))
+  (let ((f (lambda (x)
+             `(choice
+               string
+               (repeat :tag "Concatenate"
+                       (choice
+                        string
+                        (cons :tag "Separated list"
+                              (choice (string :tag "Separator")
+                                      (symbol :tag
+                                              "Indirect separator or flag"))
+                              ,x)
+                        (symbol :tag "Indirect variable (no separator)")))
+               (symbol :tag "Indirect variable (with separator)")))))
+    (funcall f (funcall f 'sexp)))
   "Type to be used for `preview-string-expand'.
 Just a hack until we get to learn how to do this properly.
 Recursive definitions are not popular with Emacs,
@@ -1157,7 +1158,7 @@ Place point at POSITION, else beginning of file."
   (let ((default-major-mode
          (or
           (assoc-default "x.ps" auto-mode-alist #'string-match)
-          default-major-mode))
+          (default-value 'major-mode)))
        (buff (get-file-buffer file)))
     (save-excursion
       (if buff
@@ -2267,8 +2268,7 @@ See description of `TeX-command-list' for details."
 
 (defun preview-copy-text (ov)
   "Copy the text of OV into the kill buffer."
-  (save-excursion
-    (set-buffer (overlay-buffer ov))
+  (with-current-buffer (overlay-buffer ov)
     (copy-region-as-kill (overlay-start ov) (overlay-end ov))))
 
 (defun preview-copy-mml (ov)
@@ -2665,7 +2665,7 @@ call, and in its CDR the final stuff for the placement 
hook."
          (lsnippet 0) lstart (lfile "") lline lbuffer lpoint
          lcounters
          string after-string error context-start
-         context offset
+         offset
          parsestate (case-fold-search nil)
          (run-buffer (current-buffer))
          (run-coding-system preview-coding-system)
@@ -2694,39 +2694,39 @@ call, and in its CDR the final stuff for the placement 
hook."
  !\\(?:offset(\\([---0-9]+\\))\\|\
 name(\\([^)]+\\))\\)\\|\
 ^Preview: \\([a-zA-Z]+\\) \\([^\n\r]*\\)\r?$" nil t)
-;;; Ok, here is a line by line breakdown:
-;;; match-alternative 1:
-;;; error indicator for TeX error, either style.
-;;; match-alternative 2:
-;;; The same, but file-line-error-style, matching on file name.
-;;; match-alternative 3:
-;;; Too ugly to describe in detail.  In short, we try to catch file
-;;; names built from path components that don't contain spaces or
-;;; other special characters once the file extension has started.
-;;;
-;;; Position for searching immediately after the file name so as to
-;;; not miss closing parens or something.
-;;; (match-string 3) is the file name.
-;;; match-alternative 4:
-;;; )+\( \|$\)
-;;; a closing paren followed by the end of line or a space: a just
-;;; closed file.
-;;; match-alternative 5 (wrapped into one shy group with
-;;; match-alternative 6, so that the match on first char is slightly
-;;; faster):
-;;; !offset(\([---0-9]+\))
-;;; an AUCTeX offset message. (match-string 5) is the offset itself
-;;; !name(\([^)]+\))
-;;; an AUCTeX file name message.  (match-string 6) is the file name
-;;; TODO: Actually, the latter two should probably again match only
-;;; after a space or newline, since that it what \message produces.
-;;;disabled in prauctex.def:
-;;;\(?:Ov\|Und\)erfull \\.*[0-9]*--[0-9]*
-;;;\(?:.\{79\}
-;;;\)*.*$\)\|
-;;; This would have caught overfull box messages that consist of
-;;; several lines of context all with 79 characters in length except
-;;; of the last one.  prauctex.def kills all such messages.
+;;;   Ok, here is a line by line breakdown:
+;;;   match-alternative 1:
+;;;   error indicator for TeX error, either style.
+;;;   match-alternative 2:
+;;;   The same, but file-line-error-style, matching on file name.
+;;;   match-alternative 3:
+;;;   Too ugly to describe in detail.  In short, we try to catch file
+;;;   names built from path components that don't contain spaces or
+;;;   other special characters once the file extension has started.
+;;;  
+;;;   Position for searching immediately after the file name so as to
+;;;   not miss closing parens or something.
+;;;   (match-string 3) is the file name.
+;;;   match-alternative 4:
+;;;   )+\( \|$\)
+;;;   a closing paren followed by the end of line or a space: a just
+;;;   closed file.
+;;;   match-alternative 5 (wrapped into one shy group with
+;;;   match-alternative 6, so that the match on first char is slightly
+;;;   faster):
+;;;   !offset(\([---0-9]+\))
+;;;   an AUCTeX offset message. (match-string 5) is the offset itself
+;;;   !name(\([^)]+\))
+;;;   an AUCTeX file name message.  (match-string 6) is the file name
+;;;   TODO: Actually, the latter two should probably again match only
+;;;   after a space or newline, since that it what \message produces.
+;;;  disabled in prauctex.def:
+;;;  \(?:Ov\|Und\)erfull \\.*[0-9]*--[0-9]*
+;;;  \(?:.\{79\}
+;;;  \)*.*$\)\|
+;;;   This would have caught overfull box messages that consist of
+;;;   several lines of context all with 79 characters in length except
+;;;   of the last one.  prauctex.def kills all such messages.
              (setq file (match-string-no-properties 2))
              (cond
               ((match-beginning 1)
@@ -2762,9 +2762,9 @@ name(\\([^)]+\\))\\)\\|\
                            context-start (point)
 
                            ;; And the line number to position the cursor.
-;;; variant 1: profiling seems to indicate the regexp-heavy solution
-;;; to be favorable.  Removing incomplete characters from the error
-;;; context is an absolute nuisance.
+;;;  variant 1: profiling seems to indicate the regexp-heavy solution
+;;;  to be favorable.  Removing incomplete characters from the error
+;;;  context is an absolute nuisance.
                            line (and (re-search-forward "\
 ^l\\.\\([0-9]+\\) 
\\(\\.\\.\\.\\(?:\\^*\\(?:[89a-f][0-9a-f]\\|address@hidden)\\|\
 \[0-9a-f]?\\)\\)?\\([^\n\r]*?\\)\r?
@@ -2804,11 +2804,12 @@ name(\\([^)]+\\))\\)\\|\
                                (setq slow-hook
                                      (nconc slow-hook (list lst)))))))
                        (condition-case err
-                           (save-excursion (run-hooks 'slow-hook))
+                           (save-excursion (mapc #'funcall slow-hook))
                          (error (preview-log-error err "Translation hook")))
                        (push (vector file (+ line offset)
                                      string after-string
-                                     snippet box counters) parsestate)))
+                                     snippet box counters)
+                              parsestate)))
                  ;; else normal error message
                  (forward-line)
                  (re-search-forward "^l\\.[0-9]" nil t)
@@ -2905,7 +2906,8 @@ name(\\([^)]+\\))\\)\\|\
                                                       'end
                                                       (- line lline))
                                  (forward-line (- line lline)))))
-                       (goto-line line))
+                        (goto-char (point-min))
+                        (forward-line (1- line)))
                      (setq lpoint (point))
                      (cond
                       ((search-forward (concat string after-string)
diff --git a/preview/prv-install.el b/preview/prv-install.el
index 52cba8f..158be5a 100644
--- a/preview/prv-install.el
+++ b/preview/prv-install.el
@@ -1,6 +1,6 @@
 ;;; prv-install.el --- Complicated install-time magic for preview-latex.
 
-;; Copyright (C) 2002, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2005, 2014  Free Software Foundation, Inc.
 
 ;; Author: David Kastrup
 ;; Keywords: convenience, tex, wp
@@ -105,7 +105,7 @@ package name, and version (to be evaluated), followed by a 
file to append."
       (fset 'message si:message))
     (while (setq append-file (pop command-line-args-left))
       (when (file-exists-p generated-autoload-file)
-       (with-temp-buffer (insert-file append-file)
+       (with-temp-buffer (insert-file-contents append-file)
                          (append-to-file (point-min) (point-max)
                                          generated-autoload-file))))
     (byte-compile-file generated-autoload-file)))

-----------------------------------------------------------------------

Summary of changes:
 preview/ChangeLog      |   17 +++++++
 preview/preview.el.in  |  118 ++++++++++++++++++++++++-----------------------
 preview/prv-install.el |    4 +-
 3 files changed, 79 insertions(+), 60 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX



reply via email to

[Prev in Thread] Current Thread [Next in Thread]