diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-09-28 07:54:24 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-09-28 07:54:24 -0700 |
| commit | 6aa93b45af9fb3631fb8fb6a04407db4d9a74107 (patch) | |
| tree | 9446e698538c3cccc3a7ac40f61e63fa028d68eb /lisp/net | |
| parent | 2d54710c36c8b5f7e0d25eefd45c318c0cb533ea (diff) | |
| parent | 1908173a4d79649566fbef12962e251c69e300a2 (diff) | |
| download | emacs-6aa93b45af9fb3631fb8fb6a04407db4d9a74107.tar.gz emacs-6aa93b45af9fb3631fb8fb6a04407db4d9a74107.tar.bz2 emacs-6aa93b45af9fb3631fb8fb6a04407db4d9a74107.zip | |
Merge from origin/emacs-26
1908173 (origin/emacs-26) Fix Bug#32828
7f5086d * lisp/net/shr.el (shr-copy-url): Fix docstring.
d309994 Fix typos in documentation
25cdd65 ; Spellcheck two more documentation strings
c8bda05 ; * lisp/simple.el (save-interprogram-paste-before-kill): Fix...
dc7fdee * doc/emacs/kmacro.texi (Basic Keyboard Macro): Mention old b...
17766a1 Improve docs of functions/variables related to 'display-buffer'
a363931 * lisp/mouse.el (tear-off-window): Fix non-mouse use (bug#32799)
8b8a4c0 Improve documentation of directory-local variables
c9c9756 Don't use obsolete variable 'save-place' in documentation
ca208e8 Use save-place-mode instead of save-place
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/dbus.el | 9 | ||||
| -rw-r--r-- | lisp/net/shr.el | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 2d9660d127f..4397817032f 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -1798,10 +1798,11 @@ GTK+. It should be used with care for at least the `:system' and this connection to those buses." (or (featurep 'dbusbind) (signal 'dbus-error (list "Emacs not compiled with dbus support"))) - (dbus--init-bus bus private) - (dbus-register-signal - bus nil dbus-path-local dbus-interface-local - "Disconnected" #'dbus-handle-bus-disconnect)) + (prog1 + (dbus--init-bus bus private) + (dbus-register-signal + bus nil dbus-path-local dbus-interface-local + "Disconnected" #'dbus-handle-bus-disconnect))) ;; Initialize `:system' and `:session' buses. This adds their file diff --git a/lisp/net/shr.el b/lisp/net/shr.el index bc86fe5a383..7ef1e18a1a0 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -321,9 +321,9 @@ under point instead." (defun shr-copy-url (url) "Copy the URL under point to the kill ring. -If IMAGE-URL (the prefix) is non-nil, or there is no link under -point, but there is an image under point then copy the URL of the -image under point instead." +With a prefix argument, or if there is no link under point, but +there is an image under point then copy the URL of the image +under point instead." (interactive (list (shr-url-at-point current-prefix-arg))) (if (not url) (message "No URL under point") |