diff options
| author | Leo Liu | 2010-12-20 19:31:15 +0800 |
|---|---|---|
| committer | Chong Yidong | 2010-12-20 19:31:15 +0800 |
| commit | e1a235757a06328c5262c19e37e89428b32571ae (patch) | |
| tree | 7a881d8def41676ff161fa6d93e87dd79c450e53 | |
| parent | 957e5dd1e98253145a6d8bf5dd392c74ac4b8409 (diff) | |
| download | emacs-e1a235757a06328c5262c19e37e89428b32571ae.tar.gz emacs-e1a235757a06328c5262c19e37e89428b32571ae.zip | |
* help-fns.el (describe-variable): Fix 2010-12-17 change (Bug#7511).
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/help-fns.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 25cc72d0b7f..dcdfa3ebc88 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-12-20 Leo <sdl.web@gmail.com> | ||
| 2 | |||
| 3 | * help-fns.el (describe-variable): Fix 2010-12-17 change. | ||
| 4 | |||
| 1 | 2010-12-20 Juri Linkov <juri@jurta.org> | 5 | 2010-12-20 Juri Linkov <juri@jurta.org> |
| 2 | 6 | ||
| 3 | * isearch.el (isearch-lazy-highlight-error): New variable. | 7 | * isearch.el (isearch-lazy-highlight-error): New variable. |
diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 5743e1f6019..5050244237d 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el | |||
| @@ -639,7 +639,7 @@ it is displayed along with the global value." | |||
| 639 | (let ((from (point))) | 639 | (let ((from (point))) |
| 640 | (terpri) | 640 | (terpri) |
| 641 | (pp val) | 641 | (pp val) |
| 642 | (if (< (point) (- 68 (line-beginning-position -1))) | 642 | (if (< (point) (+ 68 (line-beginning-position 0))) |
| 643 | (delete-region from (1+ from)) | 643 | (delete-region from (1+ from)) |
| 644 | (delete-region (1- from) from))))) | 644 | (delete-region (1- from) from))))) |
| 645 | (terpri) | 645 | (terpri) |