[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107906: (server-generate-key): `called-interactively-p' requires a parameter.

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 107906
committer: Lars Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sat 2012-04-14 13:36:26 +0200
message:
  (server-generate-key): `called-interactively-p' requires a parameter.
modified:
  lisp/ChangeLog
  lisp/server.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-14 11:16:17 +0000
+++ b/lisp/ChangeLog    2012-04-14 11:36:26 +0000
@@ -1,3 +1,8 @@
+2012-04-14  Lars Ingebrigtsen  <address@hidden>
+
+       * server.el (server-generate-key): `called-interactively-p'
+       requires a parameter.
+
 2012-04-14  Michal Nazarewicz  <address@hidden>
 
        * server.el (server-auth-key): New variable.

=== modified file 'lisp/server.el'
--- a/lisp/server.el    2012-04-14 11:16:17 +0000
+++ b/lisp/server.el    2012-04-14 11:36:26 +0000
@@ -558,7 +558,7 @@
         (loop repeat 64
               collect (+ 33 (random 94)) into auth
               finally return (concat auth))))
-    (if (called-interactively-p)
+    (if (called-interactively-p 'interactive)
        (insert auth-key))
     auth-key))