commit 16d91bce1d054c45ccd60efd5bd3ff88c12e39bb (HEAD, refs/remotes/origin/master) Author: Fabián Ezequiel Gallina Date: Mon Feb 16 19:53:59 2015 -0300 python.el: Do not deactivate mark on shell fontification. Fixes: debbugs:19871 * lisp/progmodes/python.el (python-shell-font-lock-post-command-hook): Do not deactivate mark on fontification. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 71ecb40..43cffff 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2015-02-16 Fabián Ezequiel Gallina + + python.el: Do not deactivate mark on shell fontification. (Bug#19871) + + * progmodes/python.el (python-shell-font-lock-post-command-hook): + Do not deactivate mark on fontification. + 2015-02-16 Ivan Shmakov * net/eww.el: Fix desktop support. (Bug#19226) diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 2026609..4420faf 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2360,6 +2360,7 @@ goes wrong and syntax highlighting in the shell gets messed up." (process-live-p (get-buffer-process (current-buffer)))) (let* ((input (buffer-substring-no-properties prompt-end (point-max))) + (deactivate-mark nil) (start-pos prompt-end) (buffer-undo-list t) (font-lock-buffer-pos nil) commit 8b36bfafeecf5f0578c64129be1d2017483b00f7 Author: Ivan Shmakov Date: Mon Feb 16 19:01:50 2015 +0000 Add autoload cookie for the eww-suggest-uris variable. * lisp/net/eww.el (eww-suggest-uris): Add autoload cookie, so that add-hook works correctly even if the file is not yet loaded. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 42628ff..71ecb40 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -4,6 +4,9 @@ (eww-mode): Add autoload cookie. (eww-restore-desktop): Use inhibit-read-only. + * net/eww.el (eww-suggest-uris): Add autoload cookie, so that + add-hook works correctly even if the file is not yet loaded. + 2015-02-16 Stefan Monnier * emacs-lisp/eieio.el (defclass): Use make-instance rather than diff --git a/lisp/net/eww.el b/lisp/net/eww.el index c2da4c9..b7ee065 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -60,6 +60,7 @@ :group 'eww :type 'string) +;;;###autoload (defcustom eww-suggest-uris '(eww-links-at-point url-get-url-at-point commit 2ea5364ca8d1a8dc3f8ac4c9a5ba5c7f03666258 Author: Ivan Shmakov Date: Mon Feb 16 18:55:02 2015 +0000 Fix eww.el desktop support. * lisp/net/eww.el (eww-mode): Add autoload cookie. (eww-restore-desktop): Use inhibit-read-only. Fixes: debbugs:19226 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e438343..42628ff 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-02-16 Ivan Shmakov + + * net/eww.el: Fix desktop support. (Bug#19226) + (eww-mode): Add autoload cookie. + (eww-restore-desktop): Use inhibit-read-only. + 2015-02-16 Stefan Monnier * emacs-lisp/eieio.el (defclass): Use make-instance rather than diff --git a/lisp/net/eww.el b/lisp/net/eww.el index c401701..c2da4c9 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -686,6 +686,8 @@ the like." map) "Tool bar for `eww-mode'.") +;; Autoload cookie needed by desktop.el. +;;;###autoload (define-derived-mode eww-mode special-mode "eww" "Mode for browsing the web." (setq-local eww-data (list :title "")) @@ -1877,8 +1879,9 @@ Otherwise, the restored buffer will contain a prompt to do so by using (case eww-restore-desktop ((t auto) (eww (plist-get eww-data :url))) ((zerop (buffer-size)) - (insert (substitute-command-keys - eww-restore-reload-prompt)))))) + (let ((inhibit-read-only t)) + (insert (substitute-command-keys + eww-restore-reload-prompt))))))) ;; . (current-buffer)))