Show
Ignore:
Timestamp:
05/27/06 10:35:24 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lisp/progmodes/gud.el

    r4085 r4091  
    26942694         ;; Stop displaying an arrow in a source file. 
    26952695         (setq gud-overlay-arrow-position nil) 
    2696          (with-current-buffer gud-comint-buffer 
    2697            (if (memq gud-minor-mode-type '(gdbmi gdba)) 
    2698                (gdb-reset) 
    2699              (gud-reset))) 
     2696         (if (memq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 
     2697                  '(gdba gdbmi)) 
     2698             (gdb-reset) 
     2699           (gud-reset)) 
    27002700         (let* ((obuf (current-buffer))) 
    27012701           ;; save-excursion isn't the right thing if 
     
    31673167  '(("^define\\s-+\\(\\(\\w\\|\\s_\\)+\\)" (1 font-lock-function-name-face)) 
    31683168    ("\\$\\(\\w+\\)" (1 font-lock-variable-name-face)) 
    3169     ("^\\s-*\\(\\(\\w\\|\\s_\\)+\\)" (1 font-lock-keyword-face)))) 
     3169    ("^\\s-*\\(\\w\\(\\w\\|\\s_\\)*\\)" (1 font-lock-keyword-face)))) 
    31703170 
    31713171;; FIXME: The keyword "end" associated with "document"