Show
Ignore:
Timestamp:
04/07/07 15:49:28 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/comint.el

    r4196 r4200  
    15031503  (let ((proc (get-buffer-process (current-buffer)))) 
    15041504    (if (not proc) (error "Current buffer has no process") 
     1505        (widen) 
    15051506        (let* ((pmark (process-mark proc)) 
    15061507               (intxt (if (>= (point) (marker-position pmark)) 
    …… 
    16471648          (inhibit-modification-hooks t)) 
    16481649      (add-text-properties (overlay-start comint-last-prompt-overlay) 
    1649                            (overlay-end comint-last-prompt-overlay) 
    1650                            (overlay-properties comint-last-prompt-overlay))))) 
     1650                          (overlay-end comint-last-prompt-overlay) 
     1651                          (overlay-properties comint-last-prompt-overlay))))) 
    16511652 
    16521653(defun comint-carriage-motion (start end) 
    …… 
    25942595    (display-buffer proc-buf) 
    25952596    (set-buffer proc-buf) ; but it's not the selected *window* 
    2596     (let ((proc-win (get-buffer-window proc-buf)) 
     2597    (let ((proc-win (get-buffer-window proc-buf 0)) 
    25972598          (proc-pt (marker-position proc-mark))) 
    25982599      (comint-send-string proc str) ; send the query 
    …… 
    29602961  "List in help buffer sorted COMPLETIONS. 
    29612962Typing SPC flushes the help buffer." 
    2962   (let ((window (get-buffer-window "*Completions*"))) 
     2963  (let ((window (get-buffer-window "*Completions*" 0))) 
    29632964    (setq completions (sort completions 'string-lessp)) 
    29642965    (if (and (eq last-command this-command)