diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-11-01 06:23:08 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-11-01 06:23:08 +0000 |
| commit | cd0cf71c4f41023a8d9c20b3a26e44b980992b5a (patch) | |
| tree | b763cfec551254e2228335be4e218ed7a9a19109 /lisp/simple.el | |
| parent | c40bb1ba81a5df164f0b9b61e3480c55808717b7 (diff) | |
| parent | 895725e10c0fb68ed21abb48183cc8843bcaadf3 (diff) | |
| download | emacs-cd0cf71c4f41023a8d9c20b3a26e44b980992b5a.tar.gz emacs-cd0cf71c4f41023a8d9c20b3a26e44b980992b5a.tar.bz2 emacs-cd0cf71c4f41023a8d9c20b3a26e44b980992b5a.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 142-148, 615-628)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-616
Add lisp/mh-e/.arch-inventory
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-617
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-618
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-619
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-620
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-621
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-622
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-623
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-624
Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-625
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-626
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-627
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-628
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-142
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-143
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-144
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-145
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-146
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-147
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-148
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-435
Diffstat (limited to 'lisp/simple.el')
| -rw-r--r-- | lisp/simple.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index 8e481fb7231..2602c35c094 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -3545,10 +3545,11 @@ Outline mode sets this." ;; Compute the end of the line ;; ignoring effectively invisible newlines. (save-excursion - (end-of-line) + ;; Like end-of-line but ignores fields. + (skip-chars-forward "^\n") (while (and (not (eobp)) (line-move-invisible-p (point))) (goto-char (next-char-property-change (point))) - (end-of-line)) + (skip-chars-forward "^\n")) (point)))) ;; Move to the desired column. @@ -4924,11 +4925,11 @@ is the substring.)") (funcall (get minibuffer-completion-table 'completion-base-size-function))) (setq completion-base-size 0)))) ;; Put faces on first uncommon characters and common parts. - (when (or completion-base-size completion-common-substring) + (when (or completion-common-substring completion-base-size) (let* ((common-string-length - (if completion-base-size - (- (length mbuf-contents) completion-base-size) - (length completion-common-substring))) + (if completion-common-substring + (length completion-common-substring) + (- (length mbuf-contents) completion-base-size))) (element-start (next-single-property-change (point-min) 'mouse-face)) |