[Emacs-diffs] Changes to emacs/lisp/progmodes/flymake.el

[Stefan Monnier]

Index: emacs/lisp/progmodes/flymake.el
diff -c emacs/lisp/progmodes/flymake.el:1.8 emacs/lisp/progmodes/flymake.el:1.9
*** emacs/lisp/progmodes/flymake.el:1.8 Thu Mar 24 22:42:42 2005
--- emacs/lisp/progmodes/flymake.el     Thu Mar 24 22:55:54 2005
***************
*** 49,65 ****
        (if test (make-hash-table :test test) (make-hash-table))
      (makehash test)))
  
! (defun flymake-float-time ()
!   (if (featurep 'xemacs)
!       (let ((tm (current-time)))
!       (multiple-value-bind (s0 s1 s2) (current-time)
!                            (+ (* (float (ash 1 16)) s0) (float s1) (* 
0.0000001 s2))))
!     (float-time)))
  
  (defsubst flymake-replace-regexp-in-string (regexp rep str)
!   (if (featurep 'xemacs)
!       (replace-in-string str regexp rep)
!     (replace-regexp-in-string regexp rep str)))
  
  (defun flymake-split-string (str pattern)
    "Split, then remove first and/or last in case it's empty."
--- 49,65 ----
        (if test (make-hash-table :test test) (make-hash-table))
      (makehash test)))
  
! (defalias 'flymake-float-time
!   (if (fboundp 'float-time)
!       'float-time
!     (lambda ()
!       (multiple-value-bind (s0 s1 s2) (current-time)
!       (+ (* (float (ash 1 16)) s0) (float s1) (* 0.0000001 s2))))))
  
  (defsubst flymake-replace-regexp-in-string (regexp rep str)
!   (if (fboundp 'replace-regexp-in-string)
!       (replace-regexp-in-string regexp rep str)
!     (replace-in-string str regexp rep)))
  
  (defun flymake-split-string (str pattern)
    "Split, then remove first and/or last in case it's empty."
***************
*** 71,92 ****
      splitted))
  
  (defsubst flymake-get-temp-dir ()
!   (if (featurep 'xemacs)
        (temp-directory)
      temporary-file-directory))
  
! (defun flymake-line-beginning-position ()
!   (save-excursion
!     (beginning-of-line)
!     (point)))
! 
! (defun flymake-line-end-position ()
!   (save-excursion
!     (end-of-line)
!     (point)))
  
  (defun flymake-popup-menu (pos menu-data)
!   (if (featurep 'xemacs)
        (let* ((x-pos       (nth 0 (nth 0 pos)))
             (y-pos       (nth 1 (nth 0 pos)))
             (fake-event-props  '(button 1 x 1 y 1)))
--- 71,92 ----
      splitted))
  
  (defsubst flymake-get-temp-dir ()
!   (if (fboundp 'temp-directory)
        (temp-directory)
      temporary-file-directory))
  
! (defalias 'flymake-line-beginning-position
!   (if (fboundp 'line-beginning-position)
!       'line-beginning-position
!     (lambda (&optional arg) (save-excursion (beginning-of-line arg) 
(point)))))
! 
! (defalias 'flymake-line-end-position
!   (if (fboundp 'line-end-position)
!       'line-end-position
!     (lambda (&optional arg) (save-excursion (end-of-line arg) (point)))))
  
  (defun flymake-popup-menu (pos menu-data)
!   (if (and (fboundp 'popup-menu) (fboundp 'make-event))
        (let* ((x-pos       (nth 0 (nth 0 pos)))
             (y-pos       (nth 1 (nth 0 pos)))
             (fake-event-props  '(button 1 x 1 y 1)))
***************
*** 104,113 ****
                                menu-items))
      (list menu-title (cons "" menu-commands))))
  
- (defun flymake-nop ())
- 
  (if (featurep 'xemacs) (progn
  
  (defun flymake-make-xemacs-menu (menu-data)
    (let* ((menu-title     (nth 0 menu-data))
         (menu-items     (nth 1 menu-data))
--- 104,113 ----
                                menu-items))
      (list menu-title (cons "" menu-commands))))
  
  (if (featurep 'xemacs) (progn
  
+ (defun flymake-nop ())
+ 
  (defun flymake-make-xemacs-menu (menu-data)
    (let* ((menu-title     (nth 0 menu-data))
         (menu-items     (nth 1 menu-data))
***************
*** 134,152 ****
  
  (defun flymake-current-row ()
    "Return current row number in current frame."
!   (if (featurep 'xemacs)
!       (count-lines (window-start) (point))
!     (+ (car (cdr (window-edges))) (count-lines (window-start) (point)))))
  
  (defun flymake-selected-frame ()
!   (if (featurep 'xemacs)
!       (selected-window)
!     (selected-frame)))
  
  ;;;; ]]
  
  (defcustom flymake-log-level -1
!   "Logging level, only messages with level > flymake-log-level will not be 
logged
  -1 = NONE, 0 = ERROR, 1 = WARNING, 2 = INFO, 3 = DEBUG"
    :group 'flymake
    :type 'integer)
--- 134,152 ----
  
  (defun flymake-current-row ()
    "Return current row number in current frame."
!   (if (fboundp 'window-edges)
!       (+ (car (cdr (window-edges))) (count-lines (window-start) (point)))
!     (count-lines (window-start) (point))))
  
  (defun flymake-selected-frame ()
!   (if (fboundp 'window-edges)
!       (selected-frame)
!     (selected-window)))
  
  ;;;; ]]
  
  (defcustom flymake-log-level -1
!   "Logging level, only messages with level lower or equal will be logged.
  -1 = NONE, 0 = ERROR, 1 = WARNING, 2 = INFO, 3 = DEBUG"
    :group 'flymake
    :type 'integer)
***************
*** 199,206 ****
  
    (if (eq buffer (current-buffer))
        (symbol-value var-name)
!     (save-excursion
!       (set-buffer buffer)
        (symbol-value var-name))))
  
  (defun flymake-set-buffer-var (buffer var-name var-value)
--- 199,205 ----
  
    (if (eq buffer (current-buffer))
        (symbol-value var-name)
!     (with-current-buffer buffer
        (symbol-value var-name))))
  
  (defun flymake-set-buffer-var (buffer var-name var-value)
***************
*** 210,217 ****
  
    (if (eq buffer (current-buffer))
        (set var-name var-value)
!     (save-excursion
!       (set-buffer buffer)
        (set var-name var-value))))
  
  (defvar flymake-buffer-data (flymake-makehash)
--- 209,215 ----
  
    (if (eq buffer (current-buffer))
        (set var-name var-value)
!     (with-current-buffer buffer
        (set var-name var-value))))
  
  (defvar flymake-buffer-data (flymake-makehash)
***************
*** 537,544 ****
  (defun flymake-read-file-to-temp-buffer (file-name)
    "Insert contents of FILE-NAME into newly created temp buffer."
    (let* ((temp-buffer (get-buffer-create (generate-new-buffer-name (concat 
"flymake:" (file-name-nondirectory file-name))))))
!     (save-excursion
!       (set-buffer temp-buffer)
        (insert-file-contents file-name))
      temp-buffer))
  
--- 535,541 ----
  (defun flymake-read-file-to-temp-buffer (file-name)
    "Insert contents of FILE-NAME into newly created temp buffer."
    (let* ((temp-buffer (get-buffer-create (generate-new-buffer-name (concat 
"flymake:" (file-name-nondirectory file-name))))))
!     (with-current-buffer temp-buffer
        (insert-file-contents file-name))
      temp-buffer))
  
***************
*** 546,553 ****
    "Copy contents of BUFFER into newly created temp buffer."
    (let ((contents     nil)
        (temp-buffer  nil))
!     (save-excursion
!       (set-buffer buffer)
        (setq contents (buffer-string))
  
        (setq temp-buffer (get-buffer-create (generate-new-buffer-name (concat 
"flymake:" (buffer-name buffer)))))
--- 543,549 ----
    "Copy contents of BUFFER into newly created temp buffer."
    (let ((contents     nil)
        (temp-buffer  nil))
!     (with-current-buffer buffer
        (setq contents (buffer-string))
  
        (setq temp-buffer (get-buffer-create (generate-new-buffer-name (concat 
"flymake:" (buffer-name buffer)))))
***************
*** 618,626 ****
  (defun flymake-save-buffer-in-file (buffer file-name)
    (or buffer
        (error "Invalid buffer"))
!   (save-excursion
      (save-restriction
-       (set-buffer buffer)
        (widen)
        (make-directory (file-name-directory file-name) 1)
        (write-region (point-min) (point-max) file-name nil 566)))
--- 614,621 ----
  (defun flymake-save-buffer-in-file (buffer file-name)
    (or buffer
        (error "Invalid buffer"))
!   (with-current-buffer buffer
      (save-restriction
        (widen)
        (make-directory (file-name-directory file-name) 1)
        (write-region (point-min) (point-max) file-name nil 566)))
***************
*** 665,672 ****
              (delete-process process)
  
              (when source-buffer
!               (save-excursion
!                 (set-buffer source-buffer)
  
                  (flymake-parse-residual source-buffer)
                  (flymake-post-syntax-check source-buffer exit-status command)
--- 660,666 ----
              (delete-process process)
  
              (when source-buffer
!               (with-current-buffer source-buffer
  
                  (flymake-parse-residual source-buffer)
                  (flymake-post-syntax-check source-buffer exit-status command)
***************
*** 706,713 ****
  
  (defun flymake-parse-output-and-residual (source-buffer output)
    "Split OUTPUT into lines, merge in residual if necessary."
!   (save-excursion
!     (set-buffer source-buffer)
      (let* ((buffer-residual     (flymake-get-buffer-output-residual 
source-buffer))
           (total-output        (if buffer-residual (concat buffer-residual 
output) output))
           (lines-and-residual  (flymake-split-output total-output))
--- 700,706 ----
  
  (defun flymake-parse-output-and-residual (source-buffer output)
    "Split OUTPUT into lines, merge in residual if necessary."
!   (with-current-buffer source-buffer
      (let* ((buffer-residual     (flymake-get-buffer-output-residual 
source-buffer))
           (total-output        (if buffer-residual (concat buffer-residual 
output) output))
           (lines-and-residual  (flymake-split-output total-output))
***************
*** 721,728 ****
  
  (defun flymake-parse-residual (source-buffer)
    "Parse residual if it's non empty."
!   (save-excursion
!     (set-buffer source-buffer)
      (when (flymake-get-buffer-output-residual source-buffer)
        (flymake-set-buffer-new-err-info source-buffer (flymake-parse-err-lines
                                                      
(flymake-get-buffer-new-err-info source-buffer)
--- 714,720 ----
  
  (defun flymake-parse-residual (source-buffer)
    "Parse residual if it's non empty."
!   (with-current-buffer source-buffer
      (when (flymake-get-buffer-output-residual source-buffer)
        (flymake-set-buffer-new-err-info source-buffer (flymake-parse-err-lines
                                                      
(flymake-get-buffer-new-err-info source-buffer)
***************
*** 846,853 ****
  
  (defun flymake-highlight-err-lines (buffer err-info-list)
    "Highlight error lines in BUFFER using info from ERR-INFO-LIST."
!   (save-excursion
!     (set-buffer buffer)
      (let* ((idx    0)
           (count  (length err-info-list)))
        (while (< idx count)
--- 838,844 ----
  
  (defun flymake-highlight-err-lines (buffer err-info-list)
    "Highlight error lines in BUFFER using info from ERR-INFO-LIST."
!   (with-current-buffer buffer
      (let* ((idx    0)
           (count  (length err-info-list)))
        (while (< idx count)
***************
*** 873,880 ****
  
  (defun flymake-delete-own-overlays (buffer)
    "Delete all flymake overlays in BUFFER."
!   (save-excursion
!     (set-buffer buffer)
      (let ((ov (overlays-in (point-min) (point-max))))
        (while (consp ov)
        (when (flymake-overlay-p (car ov))
--- 864,870 ----
  
  (defun flymake-delete-own-overlays (buffer)
    "Delete all flymake overlays in BUFFER."
!   (with-current-buffer buffer
      (let ((ov (overlays-in (point-min) (point-max))))
        (while (consp ov)
        (when (flymake-overlay-p (car ov))
***************
*** 891,897 ****
      (while (consp ov)
        (when (flymake-overlay-p (car ov))
        (setq has-flymake-overlays t))
!       (setq ov (cdr ov)))))
  
  (defface flymake-errline-face
    ;;+   '((((class color)) (:foreground "OrangeRed" :bold t :underline t))
--- 881,888 ----
      (while (consp ov)
        (when (flymake-overlay-p (car ov))
        (setq has-flymake-overlays t))
!       (setq ov (cdr ov)))
!     has-flymake-overlays))
  
  (defface flymake-errline-face
    ;;+   '((((class color)) (:foreground "OrangeRed" :bold t :underline t))
***************
*** 986,1006 ****
    "Grab error line patterns from ORIGINAL-LIST in compile.el format.
  Convert it to flymake internal format."
    (let* ((converted-list '()))
!     (mapcar
!      (lambda (item)
!        (setq item (cdr item))
!        (let ((regexp (nth 0 item))
!            (file (nth 1 item))
!            (line (nth 2 item))
!            (col (nth 3 item))
!            end-line)
!        (if (consp file)       (setq file (car file)))
!        (if (consp line)       (setq end-line (cdr line) line (car line)))
!        (if (consp col)        (setq col (car col)))
! 
!        (when (not (functionp line))
!          (setq converted-list (cons (list regexp file line col) 
converted-list)))))
!      original-list)
      converted-list))
  
  (eval-when-compile
--- 977,994 ----
    "Grab error line patterns from ORIGINAL-LIST in compile.el format.
  Convert it to flymake internal format."
    (let* ((converted-list '()))
!     (dolist (item original-list)
!       (setq item (cdr item))
!       (let ((regexp (nth 0 item))
!           (file (nth 1 item))
!           (line (nth 2 item))
!           (col (nth 3 item)))
!       (if (consp file)        (setq file (car file)))
!       (if (consp line)        (setq line (car line)))
!       (if (consp col) (setq col (car col)))
!       
!       (when (not (functionp line))
!         (setq converted-list (cons (list regexp file line col) 
converted-list)))))
      converted-list))
  
  (eval-when-compile
***************
*** 1211,1219 ****
  (defun flymake-get-program-dir (buffer)
    "Get dir to start program in."
    (unless (bufferp buffer)
!     (error "Invlid buffer"))
!   (save-excursion
!     (set-buffer buffer)
      default-directory))
  
  (defun flymake-safe-delete-file (file-name)
--- 1199,1206 ----
  (defun flymake-get-program-dir (buffer)
    "Get dir to start program in."
    (unless (bufferp buffer)
!     (error "Invalid buffer"))
!   (with-current-buffer buffer
      default-directory))
  
  (defun flymake-safe-delete-file (file-name)
***************
*** 1238,1245 ****
    "Start syntax checking for buffer BUFFER."
    (unless (bufferp buffer)
      (error "Expected a buffer"))
!   (save-excursion
!     (set-buffer buffer)
      (flymake-log 3 "flymake is running: %s" (flymake-get-buffer-is-running 
buffer))
      (when (and (not (flymake-get-buffer-is-running buffer))
               (flymake-can-syntax-check-file (buffer-file-name buffer)))
--- 1225,1231 ----
    "Start syntax checking for buffer BUFFER."
    (unless (bufferp buffer)
      (error "Expected a buffer"))
!   (with-current-buffer buffer
      (flymake-log 3 "flymake is running: %s" (flymake-get-buffer-is-running 
buffer))
      (when (and (not (flymake-get-buffer-is-running buffer))
               (flymake-can-syntax-check-file (buffer-file-name buffer)))
***************
*** 1385,1392 ****
    "Start a syntax check for buffer BUFFER if necessary."
    ;;+(flymake-log 3 "timer: running=%s, time=%s, cur-time=%s" 
(flymake-get-buffer-is-running buffer) (flymake-get-buffer-last-change-time 
buffer) (flymake-float-time))
    (when (and (bufferp buffer) (not (flymake-get-buffer-is-running buffer)))
!     (save-excursion
!       (set-buffer buffer)
        (when (and (flymake-get-buffer-last-change-time buffer)
                 (> (flymake-float-time) (+ flymake-no-changes-timeout 
(flymake-get-buffer-last-change-time buffer))))
        (flymake-set-buffer-last-change-time buffer nil)
--- 1371,1377 ----
    "Start a syntax check for buffer BUFFER if necessary."
    ;;+(flymake-log 3 "timer: running=%s, time=%s, cur-time=%s" 
(flymake-get-buffer-is-running buffer) (flymake-get-buffer-last-change-time 
buffer) (flymake-float-time))
    (when (and (bufferp buffer) (not (flymake-get-buffer-is-running buffer)))
!     (with-current-buffer buffer
        (when (and (flymake-get-buffer-last-change-time buffer)
                 (> (flymake-float-time) (+ flymake-no-changes-timeout 
(flymake-get-buffer-last-change-time buffer))))
        (flymake-set-buffer-last-change-time buffer nil)
***************
*** 1405,1422 ****
        (end  (if (= (point) (point-max)) (point) (1+ (point)))))
      (count-lines beg end)))
  
- (defun flymake-get-line-count (buffer)
-   "Return number of lines in buffer BUFFER."
-   (unless (bufferp buffer)
-     (error "Invalid buffer"))
-   (save-excursion
-     (set-buffer buffer)
-     (count-lines (point-min) (point-max))))
- 
  (defun flymake-count-lines (buffer)
    "Return number of lines in buffer BUFFER."
!   (save-excursion
!     (set-buffer buffer)
      (count-lines (point-min) (point-max))))
  
  (defun flymake-get-point-pixel-pos ()
--- 1390,1398 ----
        (end  (if (= (point) (point-max)) (point) (1+ (point)))))
      (count-lines beg end)))
  
  (defun flymake-count-lines (buffer)
    "Return number of lines in buffer BUFFER."
!   (with-current-buffer buffer
      (count-lines (point-min) (point-max))))
  
  (defun flymake-get-point-pixel-pos ()
***************
*** 1443,1449 ****
         (menu-data           (flymake-make-err-menu-data line-no 
line-err-info-list))
         (choice              nil)
         (mouse-pos           (flymake-get-point-pixel-pos))
-        (moved-mouse-pos     (list (car mouse-pos) (+ 10 (car (cdr 
mouse-pos)))))
         (menu-pos            (list (flymake-get-point-pixel-pos) 
(selected-window))))
      (if menu-data
        (progn
--- 1419,1424 ----
***************
*** 1525,1532 ****
  (defun flymake-report-status (buffer e-w &optional status)
    "Show status in mode line."
    (when (bufferp buffer)
!     (save-excursion
!       (set-buffer buffer)
        (when e-w
        (flymake-set-buffer-mode-line-e-w buffer e-w)
        )
--- 1500,1506 ----
  (defun flymake-report-status (buffer e-w &optional status)
    "Show status in mode line."
    (when (bufferp buffer)
!     (with-current-buffer buffer
        (when e-w
        (flymake-set-buffer-mode-line-e-w buffer e-w)
        )
***************
*** 1553,1560 ****
    (when flymake-gui-warnings-enabled
      (flymake-display-warning (format "Flymake: %s. Flymake will be switched 
OFF" warning))
      )
!   (save-excursion
!     (set-buffer buffer)
      (flymake-mode 0)
      (flymake-log 0 "switched OFF Flymake mode for buffer %s due to fatal 
status %s, warning %s"
                 (buffer-name buffer) status warning)))
--- 1527,1533 ----
    (when flymake-gui-warnings-enabled
      (flymake-display-warning (format "Flymake: %s. Flymake will be switched 
OFF" warning))
      )
!   (with-current-buffer buffer
      (flymake-mode 0)
      (flymake-log 0 "switched OFF Flymake mode for buffer %s due to fatal 
status %s, warning %s"
                 (buffer-name buffer) status warning)))