diff options
| author | Glenn Morris | 2008-03-14 02:38:45 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-03-14 02:38:45 +0000 |
| commit | 1d1100d7ace478057cc529f7e35aa3f2396c024a (patch) | |
| tree | e4dfb9adf571156b0f8c045dd07208036cc26d39 | |
| parent | c1fbdbbb5591540d64854780c30633130879caa0 (diff) | |
| download | emacs-1d1100d7ace478057cc529f7e35aa3f2396c024a.tar.gz emacs-1d1100d7ace478057cc529f7e35aa3f2396c024a.zip | |
(command-line-1): Rename -internal-script back to -scriptload (reverts
previous change).
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/startup.el | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b65b3507d72..8fc0bece69c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2008-03-14 Glenn Morris <rgm@gnu.org> | 1 | 2008-03-14 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * startup.el (command-line-1): Rename -internal-script back to | ||
| 4 | -scriptload (reverts previous change). | ||
| 5 | |||
| 3 | * textmodes/org-irc.el (top-level): CL not required when compiling. | 6 | * textmodes/org-irc.el (top-level): CL not required when compiling. |
| 4 | (org-irc-visit-erc): Replace runtime CL functions. | 7 | (org-irc-visit-erc): Replace runtime CL functions. |
| 5 | 8 | ||
diff --git a/lisp/startup.el b/lisp/startup.el index 5013da48ba1..f5ce1b7badd 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -2086,7 +2086,7 @@ A fancy display is used on graphic displays, normal otherwise." | |||
| 2086 | 2086 | ||
| 2087 | ;; This is used to handle -script. It's not clear | 2087 | ;; This is used to handle -script. It's not clear |
| 2088 | ;; we need to document it (it is totally internal). | 2088 | ;; we need to document it (it is totally internal). |
| 2089 | ((member argi '("-internal-script")) | 2089 | ((member argi '("-scriptload")) |
| 2090 | (let* ((file (command-line-normalize-file-name | 2090 | (let* ((file (command-line-normalize-file-name |
| 2091 | (or argval (pop command-line-args-left)))) | 2091 | (or argval (pop command-line-args-left)))) |
| 2092 | ;; Take file from default dir. | 2092 | ;; Take file from default dir. |