diff options
| author | Glenn Morris | 2013-05-06 00:18:36 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-05-06 00:18:36 -0700 |
| commit | 7d889a47ec1e7853cb122fd526510df90cd9fa53 (patch) | |
| tree | f85db17c649980cbfa4f2549f021fc5685a58a24 /lisp | |
| parent | 7b92bf9813b9de6d21b7eb6ae1d6f0b76b1e10d1 (diff) | |
| download | emacs-7d889a47ec1e7853cb122fd526510df90cd9fa53.tar.gz emacs-7d889a47ec1e7853cb122fd526510df90cd9fa53.zip | |
* lisp/generic-x.el: No need to require comint when compiling.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/generic-x.el | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f688e192acc..84f80c330f3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2013-05-06 Glenn Morris <rgm@gnu.org> | 1 | 2013-05-06 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * generic-x.el: No need to require comint when compiling. | ||
| 4 | |||
| 3 | * net/eudc-export.el: Make it loadable without bbdb. | 5 | * net/eudc-export.el: Make it loadable without bbdb. |
| 4 | (top-level): Use require rather than load-library. | 6 | (top-level): Use require rather than load-library. |
| 5 | (eudc-create-bbdb-record, eudc-bbdbify-phone) | 7 | (eudc-create-bbdb-record, eudc-bbdbify-phone) |
diff --git a/lisp/generic-x.el b/lisp/generic-x.el index d0250cb5210..946b81992f8 100644 --- a/lisp/generic-x.el +++ b/lisp/generic-x.el | |||
| @@ -548,7 +548,6 @@ like an INI file. You can add this hook to `find-file-hook'." | |||
| 548 | (compile | 548 | (compile |
| 549 | (concat (w32-shell-name) " -c " (buffer-file-name))))) | 549 | (concat (w32-shell-name) " -c " (buffer-file-name))))) |
| 550 | 550 | ||
| 551 | (eval-when-compile (require 'comint)) | ||
| 552 | (declare-function comint-mode "comint" ()) | 551 | (declare-function comint-mode "comint" ()) |
| 553 | (declare-function comint-exec "comint" (buffer name command startfile switches)) | 552 | (declare-function comint-exec "comint" (buffer name command startfile switches)) |
| 554 | 553 | ||