commit f995fbd9dc56bbf7bcf511b02afe1809165030e9 (HEAD, refs/remotes/origin/master) Author: Eli Zaretskii Date: Wed May 18 22:46:32 2016 +0300 * lisp/server.el (server-name): Add autoload cookie. (Bug#23576) diff --git a/lisp/server.el b/lisp/server.el index 2a9729e..e4cf431 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -255,6 +255,7 @@ This means that the server should not kill the buffer when you say you are done with it in the server.") (make-variable-buffer-local 'server-existing-buffer) +;;;###autoload (defcustom server-name "server" "The name of the Emacs server, if this Emacs process creates one. The command `server-start' makes use of this. It should not be commit de45d9145db9983c27e0a0c44540c28ebeab5946 Author: Sam Steingold Date: Wed May 18 09:56:17 2016 -0400 python-describe-at-point: add and bind diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 1e7a15d..343023f 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -330,6 +330,7 @@ ;; Some util commands (define-key map "\C-c\C-v" 'python-check) (define-key map "\C-c\C-f" 'python-eldoc-at-point) + (define-key map "\C-c\C-d" 'python-describe-at-point) ;; Utilities (substitute-key-definition 'complete-symbol 'completion-at-point map global-map) @@ -4331,6 +4332,11 @@ Interactively, prompt for symbol." nil nil symbol)))) (message (python-eldoc--get-doc-at-point symbol))) +(defun python-describe-at-point (symbol process) + (interactive (list (python-info-current-symbol) + (python-shell-get-process))) + (comint-send-string process (concat "help('" symbol "')\n"))) + ;;; Hideshow