Show
Ignore:
Timestamp:
2006年09月30日 09時12分06秒 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp

    • Property svn:ignore changed from
      *.elc
      MANIFEST
      Makefile
      Makefile.unix
      makefile
      elc.tar.gz
      cus-load.el
      finder-inf.el
      subdirs.el
      loaddefs.el
       to
      *.elc
      MANIFEST
      Makefile
      Makefile.unix
      makefile
      elc.tar.gz
      cus-load.el
      finder-inf.el
      subdirs.el
      loaddefs.el
      pre-mh-loaddefs.el-CMD

  • trunk/lisp/progmodes/compile.el

    r4166 r4169  
    17851785              (move-overlay compilation-highlight-overlay 
    17861786                            (point) end (current-buffer))) 
    1787             (if (numberp next-error-highlight) 
    1788                 (setq next-error-highlight-timer 
    1789                       (run-at-time next-error-highlight nil 'delete-overlay 
    1790                                    compilation-highlight-overlay))) 
    1791             (if (not (or (eq next-error-highlight t) 
    1792                          (numberp next-error-highlight))) 
    1793                 (delete-overlay compilation-highlight-overlay)))))) 
     1787            (if (or (eq next-error-highlight t) 
     1788                    (numberp next-error-highlight)) 
     1789                ;; We want highlighting: delete overlay on next input. 
     1790                (add-hook 'pre-command-hook 
     1791                          'compilation-goto-locus-delete-o) 
     1792              ;; We don't want highlighting: delete overlay now. 
     1793              (delete-overlay compilation-highlight-overlay)) 
     1794            ;; We want highlighting for a limited time: 
     1795            ;; set up a timer to delete it. 
     1796            (when (numberp next-error-highlight) 
     1797              (setq next-error-highlight-timer 
     1798                    (run-at-time next-error-highlight nil 
     1799                                 'compilation-goto-locus-delete-o))))))) 
    17941800    (when (and (eq next-error-highlight 'fringe-arrow)) 
     1801      ;; We want a fringe arrow (instead of highlighting). 
    17951802      (setq next-error-overlay-arrow-position 
    17961803            (copy-marker (line-beginning-position)))))) 
    17971804 
     1805(defun compilation-goto-locus-delete-o () 
     1806  (delete-overlay compilation-highlight-overlay) 
     1807  ;; Get rid of timer and hook that would try to do this again. 
     1808  (if (timerp next-error-highlight-timer) 
     1809      (cancel-timer next-error-highlight-timer)) 
     1810  (remove-hook 'pre-command-hook 
     1811               'compilation-goto-locus-delete-o)) 
    17981812  
    17991813(defun compilation-find-file (marker filename directory &rest formats)