[Emacs-diffs] /srv/bzr/emacs/trunk r106585: * lisp/progmodes/prolog.el (prolog-find-value-by-system): Avoid error when

[Stefan Monnier]

------------------------------------------------------------
revno: 106585
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10196
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2011-12-02 23:12:11 -0500
message:
  * lisp/progmodes/prolog.el (prolog-find-value-by-system): Avoid error when
  there's no inferior buffer.
  (prolog-consult-compile): Don't use toggle-read-only.
modified:
  lisp/ChangeLog
  lisp/progmodes/prolog.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-12-02 19:23:19 +0000
+++ b/lisp/ChangeLog    2011-12-03 04:12:11 +0000
@@ -1,3 +1,9 @@
+2011-12-03  Stefan Monnier  <address@hidden>
+
+       * progmodes/prolog.el (prolog-find-value-by-system): Avoid error when
+       there's no inferior buffer (bug#10196).
+       (prolog-consult-compile): Don't use toggle-read-only.
+
 2011-12-02  Michael Albinus  <address@hidden>
 
        * net/tramp-sh.el (tramp-maybe-open-connection): Handle user

=== modified file 'lisp/progmodes/prolog.el'
--- a/lisp/progmodes/prolog.el  2011-11-26 08:26:37 +0000
+++ b/lisp/progmodes/prolog.el  2011-12-03 04:12:11 +0000
@@ -868,8 +868,9 @@
 (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 @@
           ;; 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))