diff options
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/calc/calc-misc.el | 16 | ||||
-rw-r--r-- | lisp/calc/calc.el | 4 | ||||
-rw-r--r-- | lisp/calculator.el | 2 | ||||
-rw-r--r-- | lisp/cus-start.el | 3 | ||||
-rw-r--r-- | lisp/net/tramp.el | 41 | ||||
-rw-r--r-- | lisp/progmodes/gdb-mi.el | 5 | ||||
-rw-r--r-- | lisp/rfn-eshadow.el | 4 |
7 files changed, 34 insertions, 41 deletions
diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el index 29e85104131..6543920d07e 100644 --- a/lisp/calc/calc-misc.el +++ b/lisp/calc/calc-misc.el @@ -943,19 +943,9 @@ loaded and the keystroke automatically re-typed." ;;; Bug reporting ;;;###autoload -(defun report-calc-bug () - "Report a bug in Calc, the GNU Emacs calculator. -Prompts for bug subject. Leaves you in a mail buffer." - (interactive) - (let ((reporter-prompt-for-summary-p t)) - (reporter-submit-bug-report calc-bug-address "Calc" - nil nil nil - "Please describe exactly what actions triggered the bug and the -precise symptoms of the bug. If possible, include a backtrace by -doing `\\[toggle-debug-on-error]', then reproducing the bug. -" ))) -;;;###autoload -(defalias 'calc-report-bug 'report-calc-bug) +(define-obsolete-function-alias 'report-calc-bug 'report-emacs-bug "26.2") +;;;###autoload +(define-obsolete-function-alias 'calc-report-bug 'report-emacs-bug "26.2") (provide 'calc-misc) diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index 364b44bfcfe..c79db821eb6 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -486,8 +486,8 @@ to be identified as that note." "Face used to show the selected portion of a formula." :group 'calc) -(defvar calc-bug-address "emacs-devel@gnu.org" - "Address of the maintainer of Calc, for use by `report-calc-bug'.") +(define-obsolete-variable-alias 'calc-bug-address 'report-emacs-bug-address + "26.2") (defvar calc-scan-for-dels t "If t, scan keymaps to find all DEL-like keys. diff --git a/lisp/calculator.el b/lisp/calculator.el index b6959af795a..f559fb48284 100644 --- a/lisp/calculator.el +++ b/lisp/calculator.el @@ -627,7 +627,7 @@ Here are the editing keys: These operators are pre-defined: * `+' `-' `*' `/' the common binary operators -* `\\' `%' integer division and reminder +* `\\' `%' integer division and remainder * `_' `;' postfix unary negation and reciprocal * `^' `L' binary operators for x^y and log(x) in base y * `Q' `!' unary square root and factorial diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 1a5b3caea23..88a61753f25 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -711,6 +711,8 @@ since it could result in memory overflow and make Emacs crash." (put symbol 'risky-local-variable (cadr prop))) (if (setq prop (memq :set rest)) (put symbol 'custom-set (cadr prop))) + ;; This is used by describe-variable. + (if version (put symbol 'custom-version version)) ;; Don't re-add to custom-delayed-init-variables post-startup. (unless after-init-time ;; Note this is the _only_ initialize property we handle. @@ -731,7 +733,6 @@ since it could result in memory overflow and make Emacs crash." (custom-add-to-group group symbol 'custom-variable)) ;; Set the type. (put symbol 'custom-type type) - (if version (put symbol 'custom-version version)) (while rest (setq prop (car rest) propval (cadr rest) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 07154b57f20..567701a9b28 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1954,7 +1954,6 @@ For definition of that list see `tramp-set-completion-function'." ;; The method related defaults. (cdr (assoc method tramp-completion-function-alist)))) - ;;; Fontification of `read-file-name': (defvar tramp-rfn-eshadow-overlay) @@ -1964,11 +1963,11 @@ For definition of that list see `tramp-set-completion-function'." "Set up a minibuffer for `file-name-shadow-mode'. Adds another overlay hiding filename parts according to Tramp's special handling of `substitute-in-file-name'." - (when (symbol-value 'minibuffer-completing-file-name) + (when minibuffer-completing-file-name (setq tramp-rfn-eshadow-overlay (make-overlay (minibuffer-prompt-end) (minibuffer-prompt-end))) ;; Copy rfn-eshadow-overlay properties. - (let ((props (overlay-properties (symbol-value 'rfn-eshadow-overlay)))) + (let ((props (overlay-properties rfn-eshadow-overlay))) (while props ;; The `field' property prevents correct minibuffer ;; completion; we exclude it. @@ -1986,6 +1985,13 @@ special handling of `substitute-in-file-name'." (defun tramp-rfn-eshadow-update-overlay-regexp () (format "[^%s/~]*\\(/\\|~\\)" tramp-postfix-host-format)) +;; Package rfn-eshadow is preloaded in Emacs, but for some reason, +;; it only did (defvar rfn-eshadow-overlay) without giving it a global +;; value, so it was only declared as dynamically-scoped within the +;; rfn-eshadow.el file. This is now fixed in Emacs>26.1 but we still need +;; this defvar here for older releases. +(defvar rfn-eshadow-overlay) + (defun tramp-rfn-eshadow-update-overlay () "Update `rfn-eshadow-overlay' to cover shadowed part of minibuffer input. This is intended to be used as a minibuffer `post-command-hook' for @@ -1993,26 +1999,25 @@ This is intended to be used as a minibuffer `post-command-hook' for been set up by `rfn-eshadow-setup-minibuffer'." ;; In remote files name, there is a shadowing just for the local part. (ignore-errors - (let ((end (or (overlay-end (symbol-value 'rfn-eshadow-overlay)) + (let ((end (or (overlay-end rfn-eshadow-overlay) (minibuffer-prompt-end))) ;; We do not want to send any remote command. (non-essential t)) (when (tramp-tramp-file-p (buffer-substring-no-properties end (point-max))) - (save-excursion - (save-restriction - (narrow-to-region - (1+ (or (string-match - (tramp-rfn-eshadow-update-overlay-regexp) - (buffer-string) end) - end)) - (point-max)) - (let ((rfn-eshadow-overlay tramp-rfn-eshadow-overlay) - (rfn-eshadow-update-overlay-hook nil) - file-name-handler-alist) - (move-overlay rfn-eshadow-overlay (point-max) (point-max)) - (rfn-eshadow-update-overlay)))))))) + (save-restriction + (narrow-to-region + (1+ (or (string-match + (tramp-rfn-eshadow-update-overlay-regexp) + (buffer-string) end) + end)) + (point-max)) + (let ((rfn-eshadow-overlay tramp-rfn-eshadow-overlay) + (rfn-eshadow-update-overlay-hook nil) + file-name-handler-alist) + (move-overlay rfn-eshadow-overlay (point-max) (point-max)) + (rfn-eshadow-update-overlay))))))) (add-hook 'rfn-eshadow-update-overlay-hook 'tramp-rfn-eshadow-update-overlay) @@ -4666,8 +4671,6 @@ Only works for Bourne-like shells." ;; strange when doing zerop, we should kill the process and start ;; again. (Greg Stark) ;; -;; * Make shadowfile.el grok Tramp filenames. (Bug#4526, Bug#4846) -;; ;; * I was wondering if it would be possible to use tramp even if I'm ;; actually using sshfs. But when I launch a command I would like ;; to get it executed on the remote machine where the files really diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index 6fee895e6a0..da979de5400 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -1780,9 +1780,10 @@ static char *magick[] = { (defvar gdb-control-commands-regexp (concat "^\\(" - "commands\\|if\\|while\\|define\\|document\\|" + "comm\\(a\\(n\\(ds?\\)?\\)?\\)?\\|if\\|while" + "\\|def\\(i\\(ne?\\)?\\)?\\|doc\\(u\\(m\\(e\\(nt?\\)?\\)?\\)?\\)?\\|" gdb-python-guile-commands-regexp - "\\|while-stepping\\|stepping\\|ws\\|actions" + "\\|while-stepping\\|stepp\\(i\\(ng?\\)?\\)?\\|ws\\|actions" "\\)\\([[:blank:]]+\\([^[:blank:]]*\\)\\)?$") "Regexp matching GDB commands that enter a recursive reading loop. As long as GDB is in the recursive reading loop, it does not expect diff --git a/lisp/rfn-eshadow.el b/lisp/rfn-eshadow.el index 41fd8b5f97d..d6e9a1efae1 100644 --- a/lisp/rfn-eshadow.el +++ b/lisp/rfn-eshadow.el @@ -132,9 +132,7 @@ system, `file-name-shadow-properties' is used instead." ;; An overlay covering the shadowed part of the filename (local to the ;; minibuffer). -(defvar rfn-eshadow-overlay) -(make-variable-buffer-local 'rfn-eshadow-overlay) - +(defvar-local rfn-eshadow-overlay nil) ;;; Hook functions |