bug#32755: [PATCH] erc.el: Remove warning during compilation.

bug#32755: [PATCH] erc.el: Remove warning during compilation.

[Gabriel Beauchamp]

[-- Attachment #1: Type: text/plain, Size: 144 bytes --]

Hi,

I have attached a patch that removes a warning during the compilation of
erc. Tested with `emacs -Q -q' running on HEAD.

Thanks,
Gabriel


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Remove warning during compilation --]
[-- Type: text/x-diff, Size: 1603 bytes --]

From cc6d9c0c83fb62172aec5456c1ae16f217478346 Mon Sep 17 00:00:00 2001
From: Gabriel Beauchamp <beauchampgabriel@gmail.com>
Date: Mon, 17 Sep 2018 17:07:13 -0400
Subject: [PATCH] * lisp/erc/erc.el (erc-handle-irc-url): Remove warning during
 compilation.

---
 lisp/erc/erc.el | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index fc51009641..eb9082fa2f 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -5450,14 +5450,14 @@ erc-send-input
       (beep))
     nil)
    (t
-    (defvar str) ;; FIXME: Make it obey the "erc-" prefix convention.
-    (let ((str input)
+    (defvar erc--str)
+    (let ((erc--str input)
           (erc-insert-this t))
       (setq erc-send-this t)
       (run-hook-with-args 'erc-send-pre-hook input)
       (when erc-send-this
-        (if (or (string-match "\n" str)
-                (not (string-match erc-command-regexp str)))
+        (if (or (string-match "\n" erc--str)
+                (not (string-match erc-command-regexp erc--str)))
             (mapc
              (lambda (line)
                (mapc
@@ -5468,8 +5468,8 @@ erc-send-input
                                           (null erc-flood-protect) t))
                 (or (and erc-flood-protect (erc-split-line line))
                     (list line))))
-             (split-string str "\n"))
-          (erc-process-input-line (concat str "\n") t nil))
+             (split-string erc--str "\n"))
+          (erc-process-input-line (concat erc--str "\n") t nil))
         t)))))
 
 (defun erc-display-command (line)
-- 
2.17.1

bug#32755: [PATCH] erc.el: Remove warning during compilation.

[Glenn Morris]

Gabriel Beauchamp wrote:

> I have attached a patch that removes a warning during the compilation of
> erc. Tested with `emacs -Q -q' running on HEAD.

Thanks for the patch, however if someone writes FIXME for this kind of
thing rather than just doing it, it's usually because it's not so
straightforward. In this case, `str' is an advertised part of the
interface - see doc of `erc-send-pre-hook'.

> Subject: [PATCH] * lisp/erc/erc.el (erc-handle-irc-url): Remove
> warning during compilation.

You changed erc-send-input, not erc-handle-irc-url.
(You can use eg C-x 4 a on the diff for this kind of thing.)