Bind "C-x #" in a way that works even if C-x is redefined to a command key,

not a prefix key.

diff --git a/lisp/server.el b/lisp/server.el
index 73878d8435ba66db8c63491c5df51651f08161a2..48ff50f3dbcce2d3e5b4b62c8ab00105504a6d78 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -625,7 +625,7 @@ Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it."
              ;; a minibuffer/dedicated-window (if there's no other).
              (error (pop-to-buffer next-buffer)))))))))
 
-(global-set-key "\C-x#" 'server-edit)
+(define-key ctl-x-map "#" 'server-edit)
 
 (defun server-unload-hook ()
   (server-start t)