[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/comint.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/comint.el [lexbind] |
Date: |
Tue, 06 Jul 2004 05:58:49 -0400 |
Index: emacs/lisp/comint.el
diff -c emacs/lisp/comint.el:1.272.2.8 emacs/lisp/comint.el:1.272.2.9
*** emacs/lisp/comint.el:1.272.2.8 Sat May 1 23:46:14 2004
--- emacs/lisp/comint.el Tue Jul 6 09:39:53 2004
***************
*** 1182,1188 ****
than the logical beginning of line."
(save-excursion
(let ((toend (- (line-end-position) (point)))
! (start (comint-line-beginning-position)))
(goto-char start)
(while (progn
(skip-chars-forward "^!^" (- (line-end-position) toend))
--- 1182,1188 ----
than the logical beginning of line."
(save-excursion
(let ((toend (- (line-end-position) (point)))
! (start (or start (comint-line-beginning-position))))
(goto-char start)
(while (progn
(skip-chars-forward "^!^" (- (line-end-position) toend))
***************
*** 1482,1488 ****
(concat input "\n")))
(let ((beg (marker-position pmark))
! (end (if no-newline (point) (1- (point)))))
(when (> end beg)
;; Set text-properties for the input field
(add-text-properties
--- 1482,1489 ----
(concat input "\n")))
(let ((beg (marker-position pmark))
! (end (if no-newline (point) (1- (point))))
! (inhibit-modification-hooks t))
(when (> end beg)
;; Set text-properties for the input field
(add-text-properties
***************
*** 1578,1584 ****
freeze its attributes in place, even when more input comes a long
and moves the prompt overlay."
(when comint-last-prompt-overlay
! (let ((inhibit-read-only t))
(add-text-properties (overlay-start comint-last-prompt-overlay)
(overlay-end comint-last-prompt-overlay)
(overlay-properties comint-last-prompt-overlay)))))
--- 1579,1586 ----
freeze its attributes in place, even when more input comes a long
and moves the prompt overlay."
(when comint-last-prompt-overlay
! (let ((inhibit-read-only t)
! (inhibit-modification-hooks t))
(add-text-properties (overlay-start comint-last-prompt-overlay)
(overlay-end comint-last-prompt-overlay)
(overlay-properties comint-last-prompt-overlay)))))
***************
*** 1709,1715 ****
(goto-char (process-mark process)) ; in case a filter moved it
(unless comint-use-prompt-regexp-instead-of-fields
! (let ((inhibit-read-only t))
(add-text-properties comint-last-output-start (point)
'(rear-nonsticky t
field output
--- 1711,1718 ----
(goto-char (process-mark process)) ; in case a filter moved it
(unless comint-use-prompt-regexp-instead-of-fields
! (let ((inhibit-read-only t)
! (inhibit-modification-hooks t))
(add-text-properties comint-last-output-start (point)
'(rear-nonsticky t
field output
***************
*** 1718,1724 ****
;; Highlight the prompt, where we define `prompt' to mean
;; the most recent output that doesn't end with a newline.
(let ((prompt-start (save-excursion (forward-line 0) (point)))
! (inhibit-read-only t))
(when comint-prompt-read-only
(or (= (point-min) prompt-start)
(get-text-property (1- prompt-start) 'read-only)
--- 1721,1728 ----
;; Highlight the prompt, where we define `prompt' to mean
;; the most recent output that doesn't end with a newline.
(let ((prompt-start (save-excursion (forward-line 0) (point)))
! (inhibit-read-only t)
! (inhibit-modification-hooks t))
(when comint-prompt-read-only
(or (= (point-min) prompt-start)
(get-text-property (1- prompt-start) 'read-only)
***************
*** 2347,2353 ****
If the character after point does not have a front-sticky
read-only property, any read-only property of `fence' on the
preceding newline is removed."
! (let* ((pt (point)) (lst (get-text-property pt 'front-sticky)))
(and (bolp)
(not (bobp))
(if (and (get-text-property pt 'read-only)
--- 2351,2358 ----
If the character after point does not have a front-sticky
read-only property, any read-only property of `fence' on the
preceding newline is removed."
! (let* ((pt (point)) (lst (get-text-property pt 'front-sticky))
! (inhibit-modification-hooks t))
(and (bolp)
(not (bobp))
(if (and (get-text-property pt 'read-only)
***************
*** 2966,2975 ****
;; Read the next key, to process SPC.
(let (key first)
! (if (save-excursion
! (set-buffer (get-buffer "*Completions*"))
! (set (make-local-variable
! 'comint-displayed-dynamic-completions)
completions)
(setq key (read-key-sequence nil)
first (aref key 0))
--- 2971,2978 ----
;; Read the next key, to process SPC.
(let (key first)
! (if (with-current-buffer (get-buffer "*Completions*")
! (set (make-local-variable 'comint-displayed-dynamic-completions)
completions)
(setq key (read-key-sequence nil)
first (aref key 0))
- [Emacs-diffs] Changes to emacs/lisp/comint.el [lexbind],
Miles Bader <=