diff options
| author | Juanma Barranquero | 2011-04-22 22:15:21 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2011-04-22 22:15:21 +0200 |
| commit | c2fb1b6051a9acd880d99954504dd94259628f19 (patch) | |
| tree | 668caeb5a27a9608ed152ca0e08fdae6bc1f6825 | |
| parent | e02f48d76bfd57f014ffbe3ba56b62f2d5ccc794 (diff) | |
| download | emacs-c2fb1b6051a9acd880d99954504dd94259628f19.tar.gz emacs-c2fb1b6051a9acd880d99954504dd94259628f19.zip | |
lisp/eshell/esh-mode.el (find-tag-interactive): Small cleanup.
* eshell/esh-mode.el (find-tag-interactive): Declare function.
(eshell-find-tag): Remove `with-no-warnings', unneeded now.
Pass argument NO-DEFAULT to `find-tag-interactive'.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/eshell/esh-mode.el | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ed06af250f6..f422a977ebe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | 2011-04-22 Juanma Barranquero <lekktu@gmail.com> | 1 | 2011-04-22 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 2 | ||
| 3 | * eshell/esh-mode.el (find-tag-interactive): Declare function. | ||
| 4 | (eshell-find-tag): Remove `with-no-warnings', unneeded now. | ||
| 5 | Pass argument NO-DEFAULT to `find-tag-interactive'. | ||
| 6 | |||
| 7 | 2011-04-22 Juanma Barranquero <lekktu@gmail.com> | ||
| 8 | |||
| 3 | Lexical-binding cleanup. | 9 | Lexical-binding cleanup. |
| 4 | 10 | ||
| 5 | * progmodes/ada-mode.el (ada-after-change-function, ada-loose-case-word) | 11 | * progmodes/ada-mode.el (ada-after-change-function, ada-loose-case-word) |
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index 10623dba8e3..9abb0c8ecc0 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el | |||
| @@ -497,6 +497,8 @@ and the hook `eshell-exit-hook'." | |||
| 497 | (if intercept | 497 | (if intercept |
| 498 | (setq this-command 'eshell-self-insert-command))))) | 498 | (setq this-command 'eshell-self-insert-command))))) |
| 499 | 499 | ||
| 500 | (declare-function find-tag-interactive "etags" (prompt &optional no-default)) | ||
| 501 | |||
| 500 | (defun eshell-find-tag (&optional tagname next-p regexp-p) | 502 | (defun eshell-find-tag (&optional tagname next-p regexp-p) |
| 501 | "A special version of `find-tag' that ignores read-onlyness." | 503 | "A special version of `find-tag' that ignores read-onlyness." |
| 502 | (interactive) | 504 | (interactive) |
| @@ -504,8 +506,7 @@ and the hook `eshell-exit-hook'." | |||
| 504 | (let ((inhibit-read-only t) | 506 | (let ((inhibit-read-only t) |
| 505 | (no-default (eobp)) | 507 | (no-default (eobp)) |
| 506 | (find-tag-default-function 'ignore)) | 508 | (find-tag-default-function 'ignore)) |
| 507 | (with-no-warnings | 509 | (setq tagname (car (find-tag-interactive "Find tag: " no-default))) |
| 508 | (setq tagname (car (find-tag-interactive "Find tag: ")))) | ||
| 509 | (find-tag tagname next-p regexp-p))) | 510 | (find-tag tagname next-p regexp-p))) |
| 510 | 511 | ||
| 511 | (defun eshell-move-argument (limit func property arg) | 512 | (defun eshell-move-argument (limit func property arg) |