diff options
| author | Joakim Verona <joakim@verona.se> | 2011-12-28 04:12:56 +0100 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2011-12-28 04:12:56 +0100 |
| commit | bb29f044aa967831cd664c54eba0de0c701436ce (patch) | |
| tree | 1398cc9780bbae0fdad071a3a3765a571c3f6d7b /lisp/progmodes/prolog.el | |
| parent | 3c935a7e996701244d166f684119f0ff97e25496 (diff) | |
| parent | 5e605a2e528955721fc6f2bd7b9f174c15075fb1 (diff) | |
| download | emacs-bb29f044aa967831cd664c54eba0de0c701436ce.tar.gz emacs-bb29f044aa967831cd664c54eba0de0c701436ce.tar.bz2 emacs-bb29f044aa967831cd664c54eba0de0c701436ce.zip | |
upstream i think
Diffstat (limited to 'lisp/progmodes/prolog.el')
| -rw-r--r-- | lisp/progmodes/prolog.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index 8b4798e1c14..5b229cc0c24 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el @@ -164,7 +164,7 @@ ;; with the original form). My code on the matter was improved ;; considerably by Markus Triska. ;; o Fixed `prolog-insert-spaces-after-paren' (which used an -;; unitialized variable). +;; uninitialized variable). ;; o Minor changes to clean up the code and avoid some implicit ;; package requirements. ;; Version 1.13: @@ -691,7 +691,7 @@ nil means send actual operating system end of file." (defcustom prolog-use-standard-consult-compile-method-flag t "*Non-nil means use the standard compilation method. Otherwise the new compilation method will be used. This -utilises a special compilation buffer with the associated +utilizes a special compilation buffer with the associated features such as parsing of error messages and automatically jumping to the source code responsible for the error. @@ -868,8 +868,9 @@ VERSION is of the format (Major . Minor)" (defun prolog-find-value-by-system (alist) "Get value from ALIST according to `prolog-system'." (let ((system (or prolog-system - (buffer-local-value 'prolog-system - (prolog-inferior-buffer 'dont-run))))) + (let ((infbuf (prolog-inferior-buffer 'dont-run))) + (when infbuf + (buffer-local-value 'prolog-system infbuf)))))) (if (listp alist) (let (result id) @@ -1522,7 +1523,7 @@ This function must be called from the source code buffer." ;; Emacs-20). (set (make-local-variable 'compilation-parse-errors-function) 'prolog-parse-sicstus-compilation-errors)) - (toggle-read-only 0) + (setq buffer-read-only nil) (insert command-string "\n")) (save-selected-window (pop-to-buffer buffer)) @@ -1569,7 +1570,7 @@ For use with the `compilation-parse-errors-function' variable." limit t) (setq filepath (match-string 2))) - ;; ###### Does this work with SICStus under Windows (i.e. backslahes and stuff?) + ;; ###### Does this work with SICStus under Windows (i.e. backslashes and stuff?) (if (string-match "\\(.*/\\)\\([^/]*\\)$" filepath) (progn (setq dir (match-string 1 filepath)) |