[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 06b5cfe: Make `G' in eww record history
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 06b5cfe: Make `G' in eww record history |
Date: |
Sun, 07 Dec 2014 20:14:15 +0000 |
branch: master
commit 06b5cfe498a971503dc7e223e9829d561a3883ac
Author: Ivan Shmakov <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>
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.
---
lisp/ChangeLog | 8 ++++++++
lisp/net/eww.el | 17 ++++++-----------
2 files changed, 14 insertions(+), 11 deletions(-)
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 <address@hidden>
+
+ * 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 <address@hidden>
* 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 ()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 06b5cfe: Make `G' in eww record history,
Lars Ingebrigtsen <=