procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/progmodes/cfengine.el (cfengine3-make-syntax-cache): Always

Browse source 
return a syntax.  Replace call-process-shell-command with
process-file.  Ensure cfengine-mode-syntax-functions-regex is
always set.  Ensure cache when cfengine-cf-promises fails.

Fixes: debbugs:18620
This commit is contained in:
Leo Liu 2014-10-08 23:34:58 +08:00
parent c35e776245
commit 97272dad9f
2 changed files with 34 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/ChangeLog
View file

@ -1,3 +1,11 @@
2014-10-08 Leo Liu <sdl.web@gmail.com>
* progmodes/cfengine.el (cfengine3-make-syntax-cache): Always
return a syntax. Replace call-process-shell-command with
process-file. Ensure cfengine-mode-syntax-functions-regex is
always set. Ensure cache when cfengine-cf-promises fails.
(Bug#18620)
2014-10-07 Glenn Morris <rgm@gnu.org>
* font-lock.el (font-lock-fontify-buffer): Fix interactive-only markup.

50
lisp/progmodes/cfengine.el
View file

@ -1231,29 +1231,32 @@ Should not be necessary unless you reinstall CFEngine."
(setq cfengine-mode-syntax-cache nil))
(defun cfengine3-make-syntax-cache ()
"Build the CFEngine 3 syntax cache.
Calls `cfengine-cf-promises' with \"-s json\""
(let ((syntax (cddr (assoc cfengine-cf-promises cfengine-mode-syntax-cache))))
(if cfengine-cf-promises
(or syntax
(with-demoted-errors
(with-temp-buffer
(call-process-shell-command cfengine-cf-promises
nil ; no input
t ; current buffer
nil ; no redisplay
"-s" "json")
(goto-char (point-min))
(setq syntax (json-read))
(setq cfengine-mode-syntax-cache
(cons (cons cfengine-cf-promises syntax)
cfengine-mode-syntax-cache))
(setq cfengine-mode-syntax-functions-regex
(regexp-opt (mapcar (lambda (def)
(format "%s" (car def)))
(cdr (assq 'functions syntax)))
'symbols))))))
cfengine3-fallback-syntax))
"Build the CFEngine 3 syntax cache and return the syntax.
Calls `cfengine-cf-promises' with \"-s json\"."
(or (cdr (assoc cfengine-cf-promises cfengine-mode-syntax-cache))
(let ((syntax (or (when cfengine-cf-promises
(with-demoted-errors "cfengine3-make-syntax-cache: %S"
(with-temp-buffer
(or (zerop (process-file cfengine-cf-promises
nil ; no input
t ; output
nil ; no redisplay
"-s" "json"))
(error "%s" (buffer-substring
(point-min)
(progn (goto-char (point-min))
(line-end-position)))))
(goto-char (point-min))
(json-read))))
cfengine3-fallback-syntax)))
(push (cons cfengine-cf-promises syntax)
cfengine-mode-syntax-cache)
(setq cfengine-mode-syntax-functions-regex
(regexp-opt (mapcar (lambda (def)
(format "%s" (car def)))
(cdr (assq 'functions syntax)))
'symbols))
syntax)))
(defun cfengine3-documentation-function ()
"Document CFengine 3 functions around point.
@ -1265,7 +1268,6 @@ Use it by enabling `eldoc-mode'."
(defun cfengine3-completion-function ()
"Return completions for function name around or before point."
(cfengine3-make-syntax-cache)
(let* ((bounds (save-excursion
(let ((p (point)))
(skip-syntax-backward "w_" (point-at-bol))