[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 8c5be9c: Make functions invocation-directory and in
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 8c5be9c: Make functions invocation-directory and invocation-name obsolete |
Date: |
Tue, 12 Dec 2017 03:06:01 -0500 (EST) |
branch: master
commit 8c5be9cbaabc02f7c78f2bafb68e2e4ab35e130f
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Make functions invocation-directory and invocation-name obsolete
* lisp/subr.el (invocation-directory, invocation-name):
Mark the function versions as obsolete. (Bug#10476)
* lisp/startup.el (tty-handle-args):
* lisp/term/common-win.el (x-handle-xrm-switch, x-handle-name-switch):
* lisp/term/ns-win.el (top-level):
* lisp/term/pc-win.el (top-level):
* lisp/term/w32-win.el (window-system-initialization):
* lisp/term/x-win.el (top-level, x-handle-parent-id)
(x-handle-smid, window-system-initialization):
* test/lisp/htmlfontify-tests.el (htmlfontify-bug25468):
Use invocation-directory and invocation-name as variables.
---
lisp/startup.el | 2 +-
lisp/subr.el | 4 ++++
lisp/term/common-win.el | 4 ++--
lisp/term/ns-win.el | 2 +-
lisp/term/pc-win.el | 2 +-
lisp/term/w32-win.el | 4 ++--
lisp/term/x-win.el | 8 ++++----
test/lisp/htmlfontify-tests.el | 2 +-
8 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/lisp/startup.el b/lisp/startup.el
index a39c8f0..4575f1f 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -781,7 +781,7 @@ to prepare for opening the first frame (e.g. open a
connection to an X server)."
argval
(let ((case-fold-search t)
i)
- (setq argval (invocation-name))
+ (setq argval (copy-sequence invocation-name))
;; Change any . or * characters in name to
;; hyphens, so as to emulate behavior on X.
diff --git a/lisp/subr.el b/lisp/subr.el
index 7ec727e..bf51c93 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1438,6 +1438,10 @@ be a list of the form returned by `event-start' and
`event-end'."
(make-obsolete 'forward-point "use (+ (point) N) instead." "23.1")
(make-obsolete 'buffer-has-markers-at nil "24.3")
+(make-obsolete 'invocation-directory "use the variable of the same name."
+ "27.1")
+(make-obsolete 'invocation-name "use the variable of the same name." "27.1")
+
;; bug#23850
(make-obsolete 'string-to-unibyte "use `encode-coding-string'." "26.1")
(make-obsolete 'string-as-unibyte "use `encode-coding-string'." "26.1")
diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index 2cf1e84..691009e 100644
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -112,7 +112,7 @@
;; Handle the -xrm option.
(defun x-handle-xrm-switch (switch)
(unless (consp x-invocation-args)
- (error "%s: missing argument to `%s' option" (invocation-name) switch))
+ (error "%s: missing argument to `%s' option" invocation-name switch))
(setq x-command-line-resources
(if (null x-command-line-resources)
(pop x-invocation-args)
@@ -152,7 +152,7 @@
;; the initial frame, too.
(defun x-handle-name-switch (switch)
(or (consp x-invocation-args)
- (error "%s: missing argument to `%s' option" (invocation-name) switch))
+ (error "%s: missing argument to `%s' option" invocation-name switch))
(setq x-resource-name (pop x-invocation-args)
initial-frame-alist (cons (cons 'name x-resource-name)
initial-frame-alist)))
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index e895d09..82041a6 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -42,7 +42,7 @@
(eval-when-compile (require 'cl-lib))
(or (featurep 'ns)
(error "%s: Loading ns-win.el but not compiled for GNUstep/macOS"
- (invocation-name)))
+ invocation-name))
;; Documentation-purposes only: actually loaded in loadup.el.
(require 'frame)
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index 0355350..0d1c843 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -38,7 +38,7 @@
(if (not (fboundp 'msdos-remember-default-colors))
(error "%s: Loading pc-win.el but not compiled for MS-DOS"
- (invocation-name)))
+ invocation-name))
(declare-function msdos-remember-default-colors "msdos.c")
(declare-function w16-set-clipboard-data "w16select.c")
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 1db90ae..737bf7f 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -66,7 +66,7 @@
;; ../startup.el.
;; (if (not (eq window-system 'w32))
-;; (error "%s: Loading w32-win.el but not compiled for w32"
(invocation-name)))
+;; (error "%s: Loading w32-win.el but not compiled for w32"
invocation-name))
(eval-when-compile (require 'cl-lib))
(require 'frame)
@@ -310,7 +310,7 @@ See the documentation of `create-fontset-from-fontset-spec'
for the format.")
(setq x-resource-name
;; Change any . or * characters in x-resource-name to hyphens,
;; so as not to choke when we use it in X resource queries.
- (replace-regexp-in-string "[.*]" "-" (invocation-name))))
+ (replace-regexp-in-string "[.*]" "-" invocation-name)))
(x-open-connection "w32" x-command-line-resources
;; Exit with a fatal error if this fails and we
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index e7b1e08..52ab746 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -69,7 +69,7 @@
(eval-when-compile (require 'cl-lib))
(if (not (fboundp 'x-create-frame))
- (error "%s: Loading x-win.el but not compiled for X" (invocation-name)))
+ (error "%s: Loading x-win.el but not compiled for X" invocation-name))
(require 'term/common-win)
(require 'frame)
@@ -93,7 +93,7 @@
;; Handle the --parent-id option.
(defun x-handle-parent-id (switch)
(or (consp x-invocation-args)
- (error "%s: missing argument to `%s' option" (invocation-name) switch))
+ (error "%s: missing argument to `%s' option" invocation-name switch))
(setq initial-frame-alist (cons
(cons 'parent-id
(string-to-number (car x-invocation-args)))
@@ -104,7 +104,7 @@
;; to give us back our session id we had on the previous run.
(defun x-handle-smid (switch)
(or (consp x-invocation-args)
- (error "%s: missing argument to `%s' option" (invocation-name) switch))
+ (error "%s: missing argument to `%s' option" invocation-name switch))
(setq x-session-previous-id (car x-invocation-args)
x-invocation-args (cdr x-invocation-args)))
@@ -1205,7 +1205,7 @@ This returns an error if any Emacs frames are X frames."
;; Make sure we have a valid resource name.
(or (stringp x-resource-name)
(let (i)
- (setq x-resource-name (invocation-name))
+ (setq x-resource-name (copy-sequence invocation-name))
;; Change any . or * characters in x-resource-name to hyphens,
;; so as not to choke when we use it in X resource queries.
diff --git a/test/lisp/htmlfontify-tests.el b/test/lisp/htmlfontify-tests.el
index 0ad775d..614f2a1 100644
--- a/test/lisp/htmlfontify-tests.el
+++ b/test/lisp/htmlfontify-tests.el
@@ -36,7 +36,7 @@ available (Bug#25468)."
(should (equal (let ((process-environment
(cons "SHELL=/does/not/exist" process-environment)))
(call-process
- (expand-file-name (invocation-name) (invocation-directory))
+ (expand-file-name invocation-name invocation-directory)
nil nil nil
"--quick" "--batch"
(concat "--load=" (locate-library "htmlfontify"))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 8c5be9c: Make functions invocation-directory and invocation-name obsolete,
Glenn Morris <=