aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2012-04-14 13:36:26 +0200
committerLars Ingebrigtsen2012-04-14 13:36:26 +0200
commite6de100c5eafc96bf4429700e28ebdac9bc2ad8d (patch)
tree3027467fc1753cb60b29886373b7de6e964cd319
parent29734c215668ccd0c5d9affb71a7290b0ea9dbe4 (diff)
downloademacs-e6de100c5eafc96bf4429700e28ebdac9bc2ad8d.tar.gz
emacs-e6de100c5eafc96bf4429700e28ebdac9bc2ad8d.zip
(server-generate-key): `called-interactively-p' requires a parameter.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/server.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0222d51f8bc..b8b00ab4f04 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-04-14 Lars Ingebrigtsen <larsi@gnus.org>
2
3 * server.el (server-generate-key): `called-interactively-p'
4 requires a parameter.
5
12012-04-14 Michal Nazarewicz <mina86@mina86.com> 62012-04-14 Michal Nazarewicz <mina86@mina86.com>
2 7
3 * server.el (server-auth-key): New variable. 8 * server.el (server-auth-key): New variable.
diff --git a/lisp/server.el b/lisp/server.el
index dd40199ad1c..97e9510b8f2 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -558,7 +558,7 @@ into current buffer."
558 (loop repeat 64 558 (loop repeat 64
559 collect (+ 33 (random 94)) into auth 559 collect (+ 33 (random 94)) into auth
560 finally return (concat auth)))) 560 finally return (concat auth))))
561 (if (called-interactively-p) 561 (if (called-interactively-p 'interactive)
562 (insert auth-key)) 562 (insert auth-key))
563 auth-key)) 563 auth-key))
564 564