commit eb5b08bef5af19203b88d64b9052ad4ad5ea2eba (HEAD, refs/remotes/origin/master) Author: Lars Magne Ingebrigtsen Date: Sun Dec 7 22:18:09 2014 +0100 (eww-copy-page-url): Add doc string. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 188db7f..a1d60d1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -2,6 +2,7 @@ * net/eww.el (eww-follow-link): Revert prefix behaviour to previous behavior. + (eww-copy-page-url): Add doc string. 2014-12-07 Ivan Shmakov diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 139c0b1..58e0ff3 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -1346,6 +1346,7 @@ Differences in #targets are ignored." (equal (url-recreate-url obj1) (url-recreate-url obj2)))) (defun eww-copy-page-url () + "Copy the URL of the current page into the kill ring." (interactive) (message "%s" (plist-get eww-data :url)) (kill-new (plist-get eww-data :url))) commit a3ca30c8b5bd53a72590e57d30c0d98a877c8720 Author: Lars Magne Ingebrigtsen Date: Sun Dec 7 21:44:19 2014 +0100 Revert prefix behavior in RET to previous behavior * net/eww.el (eww-follow-link): Revert prefix behaviour to previous behavior. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1769c48..188db7f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-07 Lars Magne Ingebrigtsen + + * net/eww.el (eww-follow-link): Revert prefix behaviour to + previous behavior. + 2014-12-07 Ivan Shmakov * net/eww.el (eww): Moved history recording here... diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 8b78397..139c0b1 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -1315,8 +1315,8 @@ The browser to used is specified by the `shr-external-browser' variable." (defun eww-follow-link (&optional external mouse-event) "Browse the URL under point. -If EXTERNAL is single prefix, browse in new buffer. -If EXTERNAL is double prefix, browse the URL using `shr-external-browser'." +If EXTERNAL is single prefix, browse the URL using `shr-external-browser'. +If EXTERNAL is double prefix, browse in new buffer." (interactive (list current-prefix-arg last-nonmenu-event)) (mouse-set-point mouse-event) (let ((url (get-text-property (point) 'shr-url))) @@ -1325,7 +1325,7 @@ If EXTERNAL is double prefix, browse the URL using `shr-external-browser'." (message "No link under point")) ((string-match "^mailto:" url) (browse-url-mail url)) - ((and (consp external) (< 4 (car external))) + ((and (consp external) (<= (car external) 4)) (funcall shr-external-browser url)) ;; This is a #target url in the same page as the current one. ((and (url-target (url-generic-parse-url url)) commit 06b5cfe498a971503dc7e223e9829d561a3883ac Author: Ivan Shmakov Date: Sun Dec 7 21:14:07 2014 +0100 Make `G' in eww record history Fixes: debbugs:19253 * net/eww.el (eww-browse-url): Use generate-new-buffer (was: iterating over possible buffer names.) * net/eww.el (eww): Moved history recording here... (eww-browse-url): ... from here. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5ee822a..1769c48 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2014-12-07 Ivan Shmakov + + * net/eww.el (eww): Moved history recording here... + (eww-browse-url): ... from here (bug#19253). + + * net/eww.el (eww-browse-url): Use generate-new-buffer (was: + iterating over possible buffer names.) + 2014-12-07 Lars Magne Ingebrigtsen * net/eww.el (eww-reload): Take a prefix to work locally (bug#19086). diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 1e63caf..8b78397 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -253,7 +253,10 @@ word(s) will be searched for via `eww-search-prefix'." (setq url (concat url "/")))) (setq url (concat eww-search-prefix (replace-regexp-in-string " " "+" url)))))) - (unless (eq major-mode 'eww-mode) + (if (eq major-mode 'eww-mode) + (when (or (plist-get eww-data :url) + (plist-get eww-data :dom)) + (eww-save-history)) (eww-setup-buffer) (plist-put eww-data :url url) (eww-update-header-line-format) @@ -680,16 +683,8 @@ the like." ;;;###autoload (defun eww-browse-url (url &optional new-window) (cond (new-window - (let ((new-buffer "*eww*") - (num 0)) - (while (get-buffer new-buffer) - (setq num (1+ num) - new-buffer (format "*eww*<%d>" num))) - (switch-to-buffer new-buffer)) - (eww-mode)) - ((and (equal major-mode 'eww-mode) - (plist-get eww-data :url)) - (eww-save-history))) + (switch-to-buffer (generate-new-buffer "*eww*")) + (eww-mode))) (eww url)) (defun eww-back-url () commit c08883ccb42b16332cdf8115de32e80a6758cf04 Author: Lars Magne Ingebrigtsen Date: Sun Dec 7 20:50:23 2014 +0100 (eww-current-buffer): Compilation fix for bug#18550 patch. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7ebec5d..5ee822a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,7 @@ 2014-12-07 Lars Magne Ingebrigtsen * net/eww.el (eww-reload): Take a prefix to work locally (bug#19086). + (eww-current-buffer): Compilation fix for bug#18550 patch. 2014-12-07 Ivan Shmakov diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 6253e4c..1e63caf 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -1586,6 +1586,8 @@ Differences in #targets are ignored." (nthcdr eww-history-limit eww-history))) (setcdr tail nil))) +(defvar eww-current-buffer) + (defun eww-list-histories () "List the eww-histories." (interactive) commit 007d4c29c273e3c147716a9bf63b1887b1413d40 Author: Lars Magne Ingebrigtsen Date: Sun Dec 7 20:49:16 2014 +0100 Make a prefix to `eww-reload' work locally Fixes: debbugs:19086 * net/eww.el (eww-reload): Take a prefix to work locally (bug#19086). diff --git a/etc/NEWS b/etc/NEWS index 5a95133..514d423 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -211,6 +211,10 @@ pages visited) is now preserved in the desktop file. *** `eww-after-render-hook' is now called after eww has rendered the data in the buffer. +--- +*** The `eww-reload' command now takes a prefix to not reload via +the net, but just use the local copy of the HTML. + +++ *** The DOM shr and eww uses has been changed to the general Emacs xml.el/libxml2 DOM, and a new package dom.el has been added to diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c9e5bd7..7ebec5d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-12-07 Lars Magne Ingebrigtsen + + * net/eww.el (eww-reload): Take a prefix to work locally (bug#19086). + 2014-12-07 Ivan Shmakov * net/eww.el (eww-list-histories): Restore the history in the diff --git a/lisp/net/eww.el b/lisp/net/eww.el index f74f0ef..6253e4c 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -763,12 +763,19 @@ appears in a or tag." (eww-browse-url (shr-expand-url best-url (plist-get eww-data :url))) (user-error "No `top' for this page")))) -(defun eww-reload (&optional encode) - "Reload the current page." - (interactive) +(defun eww-reload (&optional local encode) + "Reload the current page. +If LOCAL (the command prefix), don't reload the page from the +network, but just re-display the HTML already fetched." + (interactive "P") (let ((url (plist-get eww-data :url))) - (url-retrieve url 'eww-render - (list url (point) (current-buffer) encode)))) + (if local + (if (null (plist-get eww-data :dom)) + (error "No current HTML data") + (eww-display-html 'utf-8 url (plist-get eww-data :dom) + (point) (current-buffer))) + (url-retrieve url 'eww-render + (list url (point) (current-buffer) encode))))) ;; Form support. @@ -1387,8 +1394,8 @@ Differences in #targets are ignored." "Set character encoding." (interactive "zUse character set (default utf-8): ") (if (null charset) - (eww-reload 'utf-8) - (eww-reload charset))) + (eww-reload nil 'utf-8) + (eww-reload nil charset))) ;;; Bookmarks code commit b9ad615e658803846192340d18919f3c7ac9b94e Author: Ivan Shmakov Date: Sun Dec 7 20:38:38 2014 +0100 eww history restoration fix Fixes: debbugs:18550 * net/eww.el (eww-list-histories): Restore the history in the correct buffer. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 287352c..c9e5bd7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-07 Ivan Shmakov + + * net/eww.el (eww-list-histories): Restore the history in the + correct buffer (bug#18550). + 2014-12-07 Lars Magne Ingebrigtsen * net/eww.el (eww-bookmark-prepare): Display URLs in first by diff --git a/lisp/net/eww.el b/lisp/net/eww.el index c1ba429..f74f0ef 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -1584,9 +1584,11 @@ Differences in #targets are ignored." (interactive) (when (null eww-history) (error "No eww-histories are defined")) - (let ((eww-history-trans eww-history)) + (let ((eww-history-trans eww-history) + (buffer (current-buffer))) (set-buffer (get-buffer-create "*eww history*")) (eww-history-mode) + (setq-local eww-current-buffer buffer) (let ((inhibit-read-only t) (domain-length 0) (title-length 0) @@ -1615,7 +1617,10 @@ Differences in #targets are ignored." (let ((history (get-text-property (line-beginning-position) 'eww-history))) (unless history (error "No history on the current line")) - (quit-window) + (let ((buffer eww-current-buffer)) + (quit-window) + (when buffer + (switch-to-buffer buffer))) (eww-restore-history history))) (defvar eww-history-mode-map commit 2c3d1113927f19903a4909f010c9fe2a73a8f741 Author: Lars Magne Ingebrigtsen Date: Sun Dec 7 20:32:07 2014 +0100 eww bookmark display fixup Fixes: debbugs:16398 * net/eww.el (eww-bookmark-prepare): Display URLs in first by displaying shortened titles first. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 50df1cd..287352c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-07 Lars Magne Ingebrigtsen + + * net/eww.el (eww-bookmark-prepare): Display URLs in first by + displaying shortened titles first (bug#16398). + 2014-12-07 Tom Willemse (tiny change) * progmodes/python.el: Recognize docstrings. diff --git a/lisp/net/eww.el b/lisp/net/eww.el index e88afb5..c1ba429 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -1440,19 +1440,18 @@ Differences in #targets are ignored." (user-error "No bookmarks are defined")) (set-buffer (get-buffer-create "*eww bookmarks*")) (eww-bookmark-mode) - (let ((format "%-40s %s") - (inhibit-read-only t) - start url) + (let* ((width (/ (window-width) 2)) + (format (format "%%-%ds %%s" width)) + (inhibit-read-only t) + start title) (erase-buffer) - (setq header-line-format (concat " " (format format "URL" "Title"))) + (setq header-line-format (concat " " (format format "Title" "URL"))) (dolist (bookmark eww-bookmarks) - (setq start (point)) - (setq url (plist-get bookmark :url)) - (when (> (length url) 40) - (setq url (substring url 0 40))) - (insert (format format url - (plist-get bookmark :title)) - "\n") + (setq start (point) + title (plist-get bookmark :title)) + (when (> (length title) width) + (setq title (substring title 0 width))) + (insert (format format title (plist-get bookmark :url)) "\n") (put-text-property start (1+ start) 'eww-bookmark bookmark)) (goto-char (point-min)))) commit 17ee1836462f7449bbe393c4fb4ea52eb9a657b8 Author: Lars Magne Ingebrigtsen Date: Sun Dec 7 18:58:15 2014 +0100 (message-change-subject): Really check whether the subject changed diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 0909418..2f0641f 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2014-12-07 Lars Magne Ingebrigtsen + + * message.el (message-change-subject): Really check whether the subject + changed. + 2014-12-05 Lars Magne Ingebrigtsen * mailcap.el (mailcap-mime-data): Add doc-view-mode as a viewer for diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index c132215..d58a292 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -2306,7 +2306,7 @@ Leading \"Re: \" is not stripped by this function. Use the function ((not (string-match (concat "^[ \t]*" (regexp-quote new-subject) - " \t]*$") + "[ \t]*$") old-subject)) ; yes, it really is a new subject ;; delete eventual Re: prefix (setq old-subject commit 9dfa949c0d24b8b74104e5cd1ac2fc0bdaa37341 Author: Tom Willemse Date: Sun Dec 7 11:24:35 2014 -0500 * lisp/progmodes/python.el: Recognize docstrings. (python-docstring-at-p, python-font-lock-syntactic-face-function): New functions. (python-mode): Use them. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f695e1c..50df1cd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,9 +1,16 @@ +2014-12-07 Tom Willemse (tiny change) + + * progmodes/python.el: Recognize docstrings. + (python-docstring-at-p, python-font-lock-syntactic-face-function): + New functions. + (python-mode): Use them. + 2014-12-06 Ulf Jasper * net/newst-treeview.el (newsticker--treeview-list-add-item) (newsticker--treeview-propertize-tag): Bind tree menu to mouse-3. (newsticker--treeview-create-groups-menu) - (newsticker--treeview-create-tree-menu): Removed. + (newsticker--treeview-create-tree-menu): Remove. (newsticker--treeview-tree-open-menu): New. (newsticker-treeview-tree-click): Pass event to `newsticker-treeview-tree-do-click'. @@ -20,8 +27,8 @@ 2014-12-05 Juri Linkov - * minibuffer.el (minibuffer-completion-help): Compare - selected-window with minibuffer-window to check whether + * minibuffer.el (minibuffer-completion-help): + Compare selected-window with minibuffer-window to check whether completions should be displayed near the minibuffer. (Bug#17809) http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00311.html @@ -52,7 +59,6 @@ both in terms of the column to which it moves and the return value. (Bug#19211) -2014-12-05 Stephen Berman 2014-12-05 Stefan Monnier * vc/ediff-init.el (ediff-odd-p): Remove. diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 9f9db6c..33c822a 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -459,6 +459,23 @@ The type returned can be `comment', `string' or `paren'." 'python-info-ppss-comment-or-string-p #'python-syntax-comment-or-string-p "24.3") +(defun python-docstring-at-p (pos) + "Check to see if there is a docstring at POS." + (save-excursion + (goto-char pos) + (if (looking-at-p "'''\\|\"\"\"") + (progn + (python-nav-backward-statement) + (looking-at "\\`\\|class \\|def ")) + nil))) + +(defun python-font-lock-syntactic-face-function (state) + (if (nth 3 state) + (if (python-docstring-at-p (nth 8 state)) + font-lock-doc-face + font-lock-string-face) + font-lock-comment-face)) + (defvar python-font-lock-keywords ;; Keywords `(,(rx symbol-start @@ -4312,7 +4329,10 @@ Arguments START and END narrow the buffer region to work on." 'python-nav-forward-sexp) (set (make-local-variable 'font-lock-defaults) - '(python-font-lock-keywords nil nil nil nil)) + '(python-font-lock-keywords + nil nil nil nil + (font-lock-syntactic-face-function + . python-font-lock-syntactic-face-function))) (set (make-local-variable 'syntax-propertize-function) python-syntax-propertize-function) commit f3a685812a408968a24dd8ca97fdfae8ef266037 Author: Jan D Date: Sun Dec 7 17:12:40 2014 +0100 Fixes: debbugs:19133 * nsimage.m (setPixmapData): Make bmRep local so class member is not set. diff --git a/src/ChangeLog b/src/ChangeLog index 27202f1..5caa073 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-12-07 Jan Djärv + + * nsimage.m (setPixmapData): Make bmRep local so class member is not + set (Bug#19133). + 2014-12-05 Lee Duhem (tiny change) * eval.c (Fsignal): Remove duplicate test. diff --git a/src/nsimage.m b/src/nsimage.m index 7b67da0..640dfcb 100644 --- a/src/nsimage.m +++ b/src/nsimage.m @@ -351,7 +351,7 @@ ns_set_alpha (void *img, int x, int y, unsigned char a) { if ([rep respondsToSelector: @selector (getBitmapDataPlanes:)]) { - bmRep = (NSBitmapImageRep *) rep; + NSBitmapImageRep *bmRep = (NSBitmapImageRep *) rep; if ([bmRep numberOfPlanes] >= 3) [bmRep getBitmapDataPlanes: pixmapData];