Commit 3f88cd72 authored by Glenn Morris's avatar Glenn Morris
Browse files

Doc fixes for emacsbug.el

* lisp/mail/emacsbug.el (report-emacs-bug-can-use-osx-open)
(report-emacs-bug-can-use-xdg-email):
(report-emacs-bug-insert-to-mailer): Doc fixes.
(report-emacs-bug): Message fix.
* etc/NEWS: Related edit.

* lisp/net/browse-url.el: Comment.
parent d95b247d
...@@ -174,6 +174,10 @@ in your ~/.authinfo file instead. ...@@ -174,6 +174,10 @@ in your ~/.authinfo file instead.
**** The command `mail-attach-file' was renamed to `mail-insert-file'. **** The command `mail-attach-file' was renamed to `mail-insert-file'.
The old name is now an obsolete alias to the new name. The old name is now an obsolete alias to the new name.
*** The M-x report-emacs-bug command can optionally pass the text of
your bug report to your desktop's preferred mail client. This
uses either the "xdg-email" utility, or OS X's "open" command.
** Emacs server and client changes ** Emacs server and client changes
+++ +++
*** New option `server-port' specifies the port on which the Emacs *** New option `server-port' specifies the port on which the Emacs
...@@ -927,8 +931,6 @@ They are superseded by shift-select-mode, enabled by default since 23.1. ...@@ -927,8 +931,6 @@ They are superseded by shift-select-mode, enabled by default since 23.1.
** Miscellaneous ** Miscellaneous
*** FIXME: xdg-open for reportbug, 2010/08.
+++ +++
*** The Landmark game is now invoked with `landmark', not `lm'. *** The Landmark game is now invoked with `landmark', not `lm'.
......
2012-02-09 Glenn Morris <rgm@gnu.org> 2012-02-09 Glenn Morris <rgm@gnu.org>
* mail/emacsbug.el (report-emacs-bug-can-use-osx-open)
(report-emacs-bug-can-use-xdg-email):
(report-emacs-bug-insert-to-mailer): Doc fixes.
(report-emacs-bug): Message fix.
* net/browse-url.el (browse-url-can-use-xdg-open) * net/browse-url.el (browse-url-can-use-xdg-open)
(browse-url-xdg-open): Doc fixes. (browse-url-xdg-open): Doc fixes.
......
...@@ -78,13 +78,16 @@ Used for querying duplicates and linking to existing bugs.") ...@@ -78,13 +78,16 @@ Used for querying duplicates and linking to existing bugs.")
(defvar message-strip-special-text-properties) (defvar message-strip-special-text-properties)
(defun report-emacs-bug-can-use-osx-open () (defun report-emacs-bug-can-use-osx-open ()
"Check if OSX open can be used to insert bug report into mailer" "Return non-nil if the OS X \"open\" command is available for mailing."
(and (featurep 'ns) (and (featurep 'ns)
(equal (executable-find "open") "/usr/bin/open") (equal (executable-find "open") "/usr/bin/open")
(memq system-type '(darwin)))) (memq system-type '(darwin))))
;; FIXME this duplicates much of the logic from browse-url-can-use-xdg-open.
(defun report-emacs-bug-can-use-xdg-email () (defun report-emacs-bug-can-use-xdg-email ()
"Check if xdg-email can be used, i.e. we are on Gnome, KDE or xfce4." "Return non-nil if the \"xdg-email\" command can be used.
xdg-email is a desktop utility that calls your preferred mail client.
This requires you to be running either Gnome, KDE, or Xfce4."
(and (getenv "DISPLAY") (and (getenv "DISPLAY")
(executable-find "xdg-email") (executable-find "xdg-email")
(or (getenv "GNOME_DESKTOP_SESSION_ID") (or (getenv "GNOME_DESKTOP_SESSION_ID")
...@@ -98,16 +101,23 @@ Used for querying duplicates and linking to existing bugs.") ...@@ -98,16 +101,23 @@ Used for querying duplicates and linking to existing bugs.")
"org.gnome.SessionManager.CanShutdown")) "org.gnome.SessionManager.CanShutdown"))
(error nil)) (error nil))
(equal (getenv "KDE_FULL_SESSION") "true") (equal (getenv "KDE_FULL_SESSION") "true")
;; FIXME? browse-url-can-use-xdg-open also accepts LXDE.
;; Is that no good here, or just overlooked?
(condition-case nil (condition-case nil
(eq 0 (call-process (eq 0 (call-process
"/bin/sh" nil nil nil "/bin/sh" nil nil nil
"-c" "-c"
;; FIXME use string-match rather than grep.
"xprop -root _DT_SAVE_MODE|grep xfce4")) "xprop -root _DT_SAVE_MODE|grep xfce4"))
(error nil))))) (error nil)))))
(defun report-emacs-bug-insert-to-mailer () (defun report-emacs-bug-insert-to-mailer ()
"Send the message to your preferred mail client.
This requires either the OS X \"open\" command, or the freedesktop
\"xdg-email\" command to be available."
(interactive) (interactive)
(save-excursion (save-excursion
;; FIXME? use mail-fetch-field?
(let* ((to (progn (let* ((to (progn
(goto-char (point-min)) (goto-char (point-min))
(forward-line) (forward-line)
...@@ -319,7 +329,7 @@ usually do not have translators for other languages.\n\n"))) ...@@ -319,7 +329,7 @@ usually do not have translators for other languages.\n\n")))
" Type \\[kill-buffer] RET to cancel (don't send it).\n")) " Type \\[kill-buffer] RET to cancel (don't send it).\n"))
(if can-insert-mail (if can-insert-mail
(princ (substitute-command-keys (princ (substitute-command-keys
" Type \\[report-emacs-bug-insert-to-mailer] to insert text to you preferred mail program.\n"))) " Type \\[report-emacs-bug-insert-to-mailer] to copy text to your preferred mail program.\n")))
(terpri) (terpri)
(princ (substitute-command-keys (princ (substitute-command-keys
" Type \\[report-emacs-bug-info] to visit in Info the Emacs Manual section " Type \\[report-emacs-bug-info] to visit in Info the Emacs Manual section
......
...@@ -969,6 +969,7 @@ This requires you to be running either Gnome, KDE, Xfce4 or LXDE." ...@@ -969,6 +969,7 @@ This requires you to be running either Gnome, KDE, Xfce4 or LXDE."
(eq 0 (call-process (eq 0 (call-process
"/bin/sh" nil nil nil "/bin/sh" nil nil nil
"-c" "-c"
;; FIXME use string-match rather than grep.
"xprop -root _DT_SAVE_MODE|grep xfce4")) "xprop -root _DT_SAVE_MODE|grep xfce4"))
(error nil)) (error nil))
(member (getenv "DESKTOP_SESSION") '("LXDE" "Lubuntu")) (member (getenv "DESKTOP_SESSION") '("LXDE" "Lubuntu"))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment