* bug#25468: 26.0.50; Can't load htmlfontify if shell binary doesn't exist
@ 2017-01-17 14:19 Philipp Stephani
2017-01-17 17:27 ` Philipp Stephani
0 siblings, 1 reply; 6+ messages in thread
From: Philipp Stephani @ 2017-01-17 14:19 UTC (permalink / raw)
To: 25468
$ SHELL=/doesnotexist src/emacs -Q -batch -l htmlfontify ; echo $?
Searching for program: No such file or directory, /doesnotexist
255
This is of course a rather rare edge case, but I think that
unavailability of a shell shouldn't prevent htmlfontify from loading.
The shell is only used to initialize hfy-etags-cmd, this variable could
simply be initialized to nil if no shell is found, similar to when no
etags binary is found.
In GNU Emacs 26.0.50.30 (x86_64-unknown-linux-gnu, GTK+ Version 3.10.8)
of 2017-01-17 built on localhost
Repository revision: 5362ef79cbb195f9df38f71b4d64e290cd7d9f50
Windowing system distributor 'The X.Org Foundation', version 11.0.11501000
System Description: Ubuntu 14.04 LTS
Recent messages:
For information about GNU Emacs and the GNU system, type C-h C-a.
Configured using:
'configure --with-modules --enable-checking
--enable-check-lisp-object-type 'CFLAGS=-ggdb3 -O0''
Configured features:
XPM JPEG TIFF GIF PNG SOUND GSETTINGS NOTIFY GNUTLS FREETYPE XFT ZLIB
TOOLKIT_SCROLL_BARS GTK3 X11 MODULES
Important settings:
value of $LANG: en_US.UTF-8
locale-coding-system: utf-8-unix
Major mode: Lisp Interaction
Minor modes in effect:
tooltip-mode: t
global-eldoc-mode: t
electric-indent-mode: t
mouse-wheel-mode: t
tool-bar-mode: t
menu-bar-mode: t
file-name-shadow-mode: t
global-font-lock-mode: t
font-lock-mode: t
blink-cursor-mode: t
auto-composition-mode: t
auto-encryption-mode: t
auto-compression-mode: t
line-number-mode: t
transient-mark-mode: t
Load-path shadows:
None found.
Features:
(shadow sort mail-extr emacsbug message subr-x puny seq byte-opt gv
bytecomp byte-compile cl-extra help-mode cconv cl-loaddefs pcase cl-lib
dired dired-loaddefs format-spec rfc822 mml easymenu mml-sec
password-cache epa derived epg epg-config gnus-util rmail rmail-loaddefs
mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils
mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr
mail-utils time-date mule-util tooltip eldoc electric uniquify
ediff-hook vc-hooks lisp-float-type mwheel term/x-win x-win
term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe
tabulated-list replace newcomment text-mode elisp-mode lisp-mode
prog-mode register page menu-bar rfn-eshadow isearch timer select
scroll-bar mouse jit-lock font-lock syntax facemenu font-core
term/tty-colors frame cl-generic cham georgian utf-8-lang misc-lang
vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932
hebrew greek romanian slovak czech european ethiopic indian cyrillic
chinese composite charscript case-table epa-hook jka-cmpr-hook help
simple abbrev obarray minibuffer cl-preloaded nadvice loaddefs button
faces cus-face macroexp files text-properties overlay sha1 md5 base64
format env code-pages mule custom widget hashtable-print-readable
backquote inotify dynamic-setting system-font-setting
font-render-setting move-toolbar gtk x-toolkit x multi-tty
make-network-process emacs)
Memory information:
((conses 16 97831 8478)
(symbols 48 20220 1)
(miscs 40 331 131)
(strings 32 18031 4413)
(string-bytes 1 592989)
(vectors 16 14093)
(vector-slots 8 473001 6992)
(floats 8 181 10)
(intervals 56 218 0)
(buffers 976 12)
(heap 1024 36888 965))
--
Google Germany GmbH
Erika-Mann-Straße 33
80636 München
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschäftsführer: Matthew Scott Sucherman, Paul Terence Manicle
Diese E-Mail ist vertraulich. Wenn Sie nicht der richtige Adressat sind,
leiten Sie diese bitte nicht weiter, informieren Sie den Absender und löschen
Sie die E-Mail und alle Anhänge. Vielen Dank.
This e-mail is confidential. If you are not the right addressee please do not
forward it, please inform the sender, and please erase this e-mail including
any attachments. Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#25468: 26.0.50; Can't load htmlfontify if shell binary doesn't exist
2017-01-17 14:19 bug#25468: 26.0.50; Can't load htmlfontify if shell binary doesn't exist Philipp Stephani
@ 2017-01-17 17:27 ` Philipp Stephani
2017-01-17 17:34 ` Glenn Morris
0 siblings, 1 reply; 6+ messages in thread
From: Philipp Stephani @ 2017-01-17 17:27 UTC (permalink / raw)
To: 25468
[-- Attachment #1.1: Type: text/plain, Size: 562 bytes --]
Philipp Stephani <p.stephani2@gmail.com> schrieb am Di., 17. Jan. 2017 um
15:21 Uhr:
>
> $ SHELL=/doesnotexist src/emacs -Q -batch -l htmlfontify ; echo $?
> Searching for program: No such file or directory, /doesnotexist
> 255
>
> This is of course a rather rare edge case, but I think that
> unavailability of a shell shouldn't prevent htmlfontify from loading.
> The shell is only used to initialize hfy-etags-cmd, this variable could
> simply be initialized to nil if no shell is found, similar to when no
> etags binary is found.
>
I've attached a patch.
[-- Attachment #1.2: Type: text/html, Size: 1056 bytes --]
[-- Attachment #2: 0001-Don-t-error-when-loading-htmlfontify-without-shell.txt --]
[-- Type: text/plain, Size: 2337 bytes --]
From a9337090f19a25e1e92de8e6b8a9aedbb720b931 Mon Sep 17 00:00:00 2001
From: Philipp Stephani <phst@google.com>
Date: Tue, 17 Jan 2017 18:24:29 +0100
Subject: [PATCH] Don't error when loading htmlfontify without shell
* lisp/htmlfontify.el (hfy-etags-cmd): Don't raise an error if no
shell is available (Bug#25468).
* test/lisp/htmlfontify-tests.el (htmlfontify-bug25468): Add unit
test.
---
lisp/htmlfontify.el | 6 +++++-
test/lisp/htmlfontify-tests.el | 12 ++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 21aac1ab21..b15aa39f10 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -376,7 +376,11 @@ hfy-etags-cmd
;; - it signals an error (`hfy-which-etags' is not defined at compile-time).
;; - we want this auto-detection to reflect the system on which Emacs is run
;; rather than the one on which it's compiled.
- (cdr (assoc (hfy-which-etags) hfy-etags-cmd-alist))
+ ;; If no shell is available, loading this file would error, therefore
+ ;; demote errors to warnings (Bug#25468).
+ (cdr (assoc (with-demoted-errors "Error detecting location of etags: %S"
+ (hfy-which-etags))
+ hfy-etags-cmd-alist))
"The etags equivalent command to run in a source directory to generate a tags
file for the whole source tree from there on down. The command should emit
the etags output on stdout.\n
diff --git a/test/lisp/htmlfontify-tests.el b/test/lisp/htmlfontify-tests.el
index 15eb7c170c..4a1d566e96 100644
--- a/test/lisp/htmlfontify-tests.el
+++ b/test/lisp/htmlfontify-tests.el
@@ -30,5 +30,17 @@
(symbol-function
'htmlfontify-load-rgb-file))))
+(ert-deftest htmlfontify-bug25468 ()
+ "Tests that htmlfontify can be loaded even if no shell is
+available (Bug#25468)."
+ (should (equal (let ((process-environment
+ (cons "SHELL=/does/not/exist" process-environment)))
+ (call-process
+ (expand-file-name (invocation-name) (invocation-directory))
+ nil nil nil
+ "--quick" "--batch"
+ (concat "--load=" (locate-library "htmlfontify"))))
+ 0)))
+
(provide 'htmlfontify-tests)
;; htmlfontify-tests.el ends here
--
2.11.0.483.g087da7b7c-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread
* bug#25468: 26.0.50; Can't load htmlfontify if shell binary doesn't exist
2017-01-17 17:27 ` Philipp Stephani
@ 2017-01-17 17:34 ` Glenn Morris
2017-01-17 18:23 ` Philipp Stephani
0 siblings, 1 reply; 6+ messages in thread
From: Glenn Morris @ 2017-01-17 17:34 UTC (permalink / raw)
To: Philipp Stephani; +Cc: 25468
I don't see a need for hfy-which-etags to go via the shell at all,
so a better change to me would be to use call-process instead of
shell-command-to-string there. I see there's also hfy-shell-file-name
for some reason.
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#25468: 26.0.50; Can't load htmlfontify if shell binary doesn't exist
2017-01-17 17:34 ` Glenn Morris
@ 2017-01-17 18:23 ` Philipp Stephani
2017-01-24 16:43 ` Philipp Stephani
0 siblings, 1 reply; 6+ messages in thread
From: Philipp Stephani @ 2017-01-17 18:23 UTC (permalink / raw)
To: Glenn Morris; +Cc: 25468
[-- Attachment #1.1: Type: text/plain, Size: 338 bytes --]
Glenn Morris <rgm@gnu.org> schrieb am Di., 17. Jan. 2017 um 18:34 Uhr:
>
> I don't see a need for hfy-which-etags to go via the shell at all,
> so a better change to me would be to use call-process instead of
> shell-command-to-string there. I see there's also hfy-shell-file-name
> for some reason.
>
Good point, here's another patch.
[-- Attachment #1.2: Type: text/html, Size: 718 bytes --]
[-- Attachment #2: 0001-Don-t-require-a-shell-when-loading-htmlfontify.txt --]
[-- Type: text/plain, Size: 2384 bytes --]
From fd8196503247a4577a422475c6b8552b0ef4068e Mon Sep 17 00:00:00 2001
From: Philipp Stephani <phst@google.com>
Date: Tue, 17 Jan 2017 18:24:29 +0100
Subject: [PATCH] Don't require a shell when loading htmlfontify
* lisp/htmlfontify.el (hfy-which-etags): Don't call a shell for
detecting the etags version (Bug#25468).
* test/lisp/htmlfontify-tests.el (htmlfontify-bug25468): Add unit
test.
---
lisp/htmlfontify.el | 12 +++++++++---
test/lisp/htmlfontify-tests.el | 12 ++++++++++++
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 21aac1ab21..74393ffbae 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -365,9 +365,15 @@ hfy-ignored-properties
(defun hfy-which-etags ()
"Return a string indicating which flavor of etags we are using."
- (let ((v (shell-command-to-string (concat hfy-etags-bin " --version"))))
- (cond ((string-match "exube" v) "exuberant ctags")
- ((string-match "GNU E" v) "emacs etags" )) ))
+ (with-temp-buffer
+ (condition-case nil
+ (when (eq (call-process hfy-etags-bin nil t nil "--version") 0)
+ (goto-char (point-min))
+ (cond
+ ((looking-at-p "exube") "exuberant ctags")
+ ((looking-at-p "GNU E") "emacs etags")))
+ ;; Return nil if the etags binary isn't executable (Bug#25468).
+ (file-error nil))))
(defcustom hfy-etags-cmd
;; We used to wrap this in a `eval-and-compile', but:
diff --git a/test/lisp/htmlfontify-tests.el b/test/lisp/htmlfontify-tests.el
index 15eb7c170c..4a1d566e96 100644
--- a/test/lisp/htmlfontify-tests.el
+++ b/test/lisp/htmlfontify-tests.el
@@ -30,5 +30,17 @@
(symbol-function
'htmlfontify-load-rgb-file))))
+(ert-deftest htmlfontify-bug25468 ()
+ "Tests that htmlfontify can be loaded even if no shell is
+available (Bug#25468)."
+ (should (equal (let ((process-environment
+ (cons "SHELL=/does/not/exist" process-environment)))
+ (call-process
+ (expand-file-name (invocation-name) (invocation-directory))
+ nil nil nil
+ "--quick" "--batch"
+ (concat "--load=" (locate-library "htmlfontify"))))
+ 0)))
+
(provide 'htmlfontify-tests)
;; htmlfontify-tests.el ends here
--
2.11.0.483.g087da7b7c-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread
* bug#25468: 26.0.50; Can't load htmlfontify if shell binary doesn't exist
2017-01-17 18:23 ` Philipp Stephani
@ 2017-01-24 16:43 ` Philipp Stephani
2017-01-27 17:59 ` Philipp Stephani
0 siblings, 1 reply; 6+ messages in thread
From: Philipp Stephani @ 2017-01-24 16:43 UTC (permalink / raw)
To: Glenn Morris; +Cc: 25468
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
Philipp Stephani <p.stephani2@gmail.com> schrieb am Di., 17. Jan. 2017 um
19:23 Uhr:
> Glenn Morris <rgm@gnu.org> schrieb am Di., 17. Jan. 2017 um 18:34 Uhr:
>
>
> I don't see a need for hfy-which-etags to go via the shell at all,
> so a better change to me would be to use call-process instead of
> shell-command-to-string there. I see there's also hfy-shell-file-name
> for some reason.
>
>
> Good point, here's another patch.
>
Unless there are further comments, I'll push this patch to master in a few
days.
[-- Attachment #2: Type: text/html, Size: 1398 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#25468: 26.0.50; Can't load htmlfontify if shell binary doesn't exist
2017-01-24 16:43 ` Philipp Stephani
@ 2017-01-27 17:59 ` Philipp Stephani
0 siblings, 0 replies; 6+ messages in thread
From: Philipp Stephani @ 2017-01-27 17:59 UTC (permalink / raw)
To: Glenn Morris, 25468-done
[-- Attachment #1: Type: text/plain, Size: 635 bytes --]
Philipp Stephani <p.stephani2@gmail.com> schrieb am Di., 24. Jan. 2017 um
17:43 Uhr:
> Philipp Stephani <p.stephani2@gmail.com> schrieb am Di., 17. Jan. 2017 um
> 19:23 Uhr:
>
> Glenn Morris <rgm@gnu.org> schrieb am Di., 17. Jan. 2017 um 18:34 Uhr:
>
>
> I don't see a need for hfy-which-etags to go via the shell at all,
> so a better change to me would be to use call-process instead of
> shell-command-to-string there. I see there's also hfy-shell-file-name
> for some reason.
>
>
> Good point, here's another patch.
>
>
> Unless there are further comments, I'll push this patch to master in a few
> days.
>
Pushed as 107a0c4caa.
[-- Attachment #2: Type: text/html, Size: 2013 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-01-27 17:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-17 14:19 bug#25468: 26.0.50; Can't load htmlfontify if shell binary doesn't exist Philipp Stephani
2017-01-17 17:27 ` Philipp Stephani
2017-01-17 17:34 ` Glenn Morris
2017-01-17 18:23 ` Philipp Stephani
2017-01-24 16:43 ` Philipp Stephani
2017-01-27 17:59 ` Philipp Stephani
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.