Revert "* lisp/calc/calc-ext.el (math-scalarp): Fix typo"

This reverts commit 698ff554ac2699ec48fefc85a1307cbc4a183b0d.

2 files changed, 15 insertions, 16 deletions

diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index bdce91f221f..53a59207839 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -536,17 +536,17 @@ keybindings will not do anything useful."
   ((when (boundp 'erc-track-when-inactive)
      (if erc-track-when-inactive
          (progn
-           (add-hook 'window-configuration-change-hook #'erc-user-is-active)
-           (add-hook 'erc-send-completed-hook #'erc-user-is-active)
-           (add-hook 'erc-server-001-functions #'erc-user-is-active))
+           (add-hook 'window-configuration-change-hook 'erc-user-is-active)
+           (add-hook 'erc-send-completed-hook 'erc-user-is-active)
+           (add-hook 'erc-server-001-functions 'erc-user-is-active))
        (erc-track-add-to-mode-line erc-track-position-in-mode-line)
        (erc-update-mode-line)
        (add-hook 'window-configuration-change-hook
-                 #'erc-window-configuration-change)
-       (add-hook 'erc-insert-post-hook #'erc-track-modified-channels)
-       (add-hook 'erc-disconnected-hook #'erc-modified-channels-update))
+                 'erc-window-configuration-change)
+       (add-hook 'erc-insert-post-hook 'erc-track-modified-channels)
+       (add-hook 'erc-disconnected-hook 'erc-modified-channels-update))
      ;; enable the tracking keybindings
-     (add-hook 'erc-connect-pre-hook #'erc-track-minor-mode-maybe)
+     (add-hook 'erc-connect-pre-hook 'erc-track-minor-mode-maybe)
      (erc-track-minor-mode-maybe)))
   ;; Disable:
   ((when (boundp 'erc-track-when-inactive)
@@ -554,15 +554,14 @@ keybindings will not do anything useful."
      (if erc-track-when-inactive
          (progn
            (remove-hook 'window-configuration-change-hook
-                        #'erc-user-is-active)
-           (remove-hook 'erc-send-completed-hook #'erc-user-is-active)
-           (remove-hook 'erc-server-001-functions #'erc-user-is-active)
-           ;; FIXME: Never added!?
-           (remove-hook 'erc-timer-hook #'erc-user-is-active))
+                        'erc-user-is-active)
+           (remove-hook 'erc-send-completed-hook 'erc-user-is-active)
+           (remove-hook 'erc-server-001-functions 'erc-user-is-active)
+           (remove-hook 'erc-timer-hook 'erc-user-is-active))
        (remove-hook 'window-configuration-change-hook
-                    #'erc-window-configuration-change)
-       (remove-hook 'erc-disconnected-hook #'erc-modified-channels-update)
-       (remove-hook 'erc-insert-post-hook #'erc-track-modified-channels))
+                    'erc-window-configuration-change)
+       (remove-hook 'erc-disconnected-hook 'erc-modified-channels-update)
+       (remove-hook 'erc-insert-post-hook 'erc-track-modified-channels))
      ;; disable the tracking keybindings
      (remove-hook 'erc-connect-pre-hook 'erc-track-minor-mode-maybe)
      (when erc-track-minor-mode
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 0b0cc044e91..f5c9decc3a2 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -5453,7 +5453,7 @@ This returns non-nil only if we actually send anything."
     ;; obsolete, and when it's finally removed, this binding should
     ;; also be removed.
     (with-suppressed-warnings ((lexical str))
-      (defvar str))  ;FIXME: Obey the "erc-" prefix convention.
+      (defvar str))
     (let ((str input)
           (erc-insert-this t)
           (erc-send-this t)