From 18cee9eca2aa558bebc4ee18cb5bc0503a85d9f2 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Tue, 24 Dec 2013 17:42:03 +0100 Subject: In balance-windows-area don't call window-height and window-width. Bug#16241. * window.el (balance-windows-area): Call window-size instead of window-height and window-width. Bug#16241. --- lisp/ChangeLog | 5 +++++ lisp/window.el | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 79244ec160c..5402775dfbb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-12-24 Martin Rudalics + + * window.el (balance-windows-area): Call window-size instead of + window-height and window-width. Bug#16241. + 2013-12-24 Lars Ingebrigtsen * net/eww.el (eww-bookmark-quit): Remove. diff --git a/lisp/window.el b/lisp/window.el index 3b841747205..b58f8b85815 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -4681,12 +4681,12 @@ specific buffers." ;; (assert (eq next (or (cadr (member win wins)) (car wins)))) (let* ((horiz (< (car (window-pixel-edges win)) (car (window-pixel-edges next)))) - (areadiff (/ (- (* (window-height next pixelwise) - (window-width next pixelwise) + (areadiff (/ (- (* (window-size next nil pixelwise) + (window-size next t pixelwise) (buffer-local-value 'window-area-factor (window-buffer next))) - (* (window-height win pixelwise) - (window-width win pixelwise) + (* (window-size win nil pixelwise) + (window-size win t pixelwise) (buffer-local-value 'window-area-factor (window-buffer win)))) (max (buffer-local-value 'window-area-factor @@ -4694,10 +4694,10 @@ specific buffers." (buffer-local-value 'window-area-factor (window-buffer next))))) (edgesize (if horiz - (+ (window-height win pixelwise) - (window-height next pixelwise)) - (+ (window-width win pixelwise) - (window-width next pixelwise)))) + (+ (window-size win nil pixelwise) + (window-size next nil pixelwise)) + (+ (window-size win t pixelwise) + (window-size next t pixelwise)))) (diff (/ areadiff edgesize))) (when (zerop diff) ;; Maybe diff is actually closer to 1 than to 0. -- cgit v1.2.1 From 121ea65f3f9ecd549ddeefda2a0268f2029f5dbd Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 24 Dec 2013 19:23:56 +0200 Subject: Fix eww-open-file for MS-Windows and MS-DOS. lisp/net/eww.el (eww-open-file): Ensure 3 slashes after "file:" when we run on MS-Windows or MS-DOS. --- lisp/ChangeLog | 5 +++++ lisp/net/eww.el | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5402775dfbb..f7caaf69358 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-12-24 Eli Zaretskii + + * net/eww.el (eww-open-file): Ensure 3 slashes after "file:" when + we run on MS-Windows or MS-DOS. + 2013-12-24 Martin Rudalics * window.el (balance-windows-area): Call window-size instead of diff --git a/lisp/net/eww.el b/lisp/net/eww.el index b7f50c19321..c5ac2f5c86c 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -167,7 +167,10 @@ word(s) will be searched for via `eww-search-prefix'." (defun eww-open-file (file) "Render a file using EWW." (interactive "fFile: ") - (eww (concat "file://" (expand-file-name file)))) + (eww (concat "file://" + (and (memq system-type '(windows-nt ms-dos)) + "/") + (expand-file-name file)))) (defun eww-render (status url &optional point) (let ((redirect (plist-get status :redirect))) -- cgit v1.2.1 From eeef121a18b0317cbe739e104c0b024289e4b851 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Tue, 24 Dec 2013 19:07:55 +0100 Subject: eww bookmark window restoration * net/eww.el (eww-bookmark-browse): Use `quit-window' to restore the window configuration. --- lisp/ChangeLog | 5 +++++ lisp/net/eww.el | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f7caaf69358..c3185a37a71 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-12-24 Lars Ingebrigtsen + + * net/eww.el (eww-bookmark-browse): Use `quit-window' to restore + the window configuration. + 2013-12-24 Eli Zaretskii * net/eww.el (eww-open-file): Ensure 3 slashes after "file:" when diff --git a/lisp/net/eww.el b/lisp/net/eww.el index c5ac2f5c86c..02c93a0c677 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -1086,8 +1086,6 @@ Differences in #targets are ignored." ;;; Bookmarks code (defvar eww-bookmarks nil) -(defvar eww-previous-window-configuration nil) -(make-variable-buffer-local 'eww-previous-window-configuration) (defun eww-add-bookmark () "Add the current page to the bookmarks." @@ -1132,7 +1130,6 @@ Differences in #targets are ignored." (unless eww-bookmarks (user-error "No bookmarks are defined")) (set-buffer (get-buffer-create "*eww bookmarks*")) - (setq eww-previous-window-configuration (current-window-configuration)) (eww-bookmark-mode) (let ((format "%-40s %s") (inhibit-read-only t) @@ -1191,8 +1188,6 @@ Differences in #targets are ignored." (unless bookmark (user-error "No bookmark on the current line")) (quit-window) - (when eww-previous-window-configuration - (set-window-configuration eww-previous-window-configuration)) (eww-browse-url (plist-get bookmark :url)))) (defun eww-next-bookmark () -- cgit v1.2.1 From 89c868adeef16e407569a3d607dd64ccadba17c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Ezequiel=20Gallina?= Date: Tue, 24 Dec 2013 16:48:40 -0300 Subject: * lisp/progmodes/python.el (python-nav-beginning-of-statement): Speed up. Fixes: debbugs:15295 --- lisp/ChangeLog | 5 +++++ lisp/progmodes/python.el | 24 +++++++++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c3185a37a71..1c66a806c5f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-12-24 Fabián Ezequiel Gallina + + * progmodes/python.el (python-nav-beginning-of-statement): Speed + up (Bug#15295). + 2013-12-24 Lars Ingebrigtsen * net/eww.el (eww-bookmark-browse): Use `quit-window' to restore diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index aeee179c7e7..07a8bba6b18 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -1279,15 +1279,21 @@ nested definitions." (defun python-nav-beginning-of-statement () "Move to start of current statement." (interactive "^") - (while (and (or (back-to-indentation) t) - (not (bobp)) - (when (or - (save-excursion - (forward-line -1) - (python-info-line-ends-backslash-p)) - (python-syntax-context 'string) - (python-syntax-context 'paren)) - (forward-line -1)))) + (back-to-indentation) + (let* ((ppss (syntax-ppss)) + (context-point + (or + (python-syntax-context 'paren ppss) + (python-syntax-context 'string ppss)))) + (cond ((bobp)) + (context-point + (goto-char context-point) + (python-nav-beginning-of-statement)) + ((save-excursion + (forward-line -1) + (python-info-line-ends-backslash-p)) + (forward-line -1) + (python-nav-beginning-of-statement)))) (point-marker)) (defun python-nav-end-of-statement (&optional noend) -- cgit v1.2.1 From fec0e8283f7ce156c6fa1aa86a36a84ada54965b Mon Sep 17 00:00:00 2001 From: Kenjiro NAKAYAMA Date: Wed, 25 Dec 2013 16:33:16 +0100 Subject: eww textarea fixups * net/eww.el (eww-form-textarea): Use a different face for textareas than text input since they have different keymaps. Fixes: debbugs:16142 --- lisp/ChangeLog | 6 ++++++ lisp/net/eww.el | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1c66a806c5f..19d14f69017 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2013-12-25 Kenjiro NAKAYAMA + + * net/eww.el (eww-form-textarea): Use a different face for + textareas than text input since they have different keymaps + (bug#16142). + 2013-12-24 Fabián Ezequiel Gallina * progmodes/python.el (python-nav-beginning-of-statement): Speed diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 02c93a0c677..25309d16951 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -115,6 +115,14 @@ See also `eww-form-checkbox-selected-symbol'." :version "24.4" :group 'eww) +(defface eww-form-textarea + '((t (:background "#C0C0C0" + :foreground "black" + :box (:line-width 1)))) + "Face for eww textarea inputs." + :version "24.4" + :group 'eww) + (defvar eww-current-url nil) (defvar eww-current-dom nil) (defvar eww-current-source nil) @@ -776,7 +784,7 @@ See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.") (when (> pad 0) (insert (make-string pad ? )))) (add-face-text-property (line-beginning-position) - (point) 'eww-form-text) + (point) 'eww-form-textarea) (put-text-property (line-beginning-position) (point) 'local-map eww-textarea-map) (forward-line 1)) -- cgit v1.2.1 From 99e4926fcbee9f7e75ed19b194fa7a2aa59c98c1 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Wed, 25 Dec 2013 18:31:39 +0100 Subject: Fold shr text with single quotation marks better * net/shr.el (shr-find-fill-point): Don't break lines before a quotation mark. --- lisp/ChangeLog | 5 +++++ lisp/net/shr.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 19d14f69017..b1a76998639 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-12-25 Lars Ingebrigtsen + + * net/shr.el (shr-find-fill-point): Don't break lines before a + quotation mark. + 2013-12-25 Kenjiro NAKAYAMA * net/eww.el (eww-form-textarea): Use a different face for diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 5c30bd8ac67..bb7b7106c7b 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -550,7 +550,8 @@ size, and full-buffer size." (if (looking-at "\\(\\c<+\\)\\c<") (goto-char (match-end 1)) (forward-char 1)))) - ((shr-char-kinsoku-bol-p (following-char)) + ((and (shr-char-kinsoku-bol-p (following-char)) + (not (eq (following-char) ?'))) ;; Find forward the point where kinsoku-bol characters end. (let ((count 4)) (while (progn -- cgit v1.2.1 From 0137922173eb3655aa0d9787991ecb62602e47c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Ezequiel=20Gallina?= Date: Wed, 25 Dec 2013 15:07:31 -0300 Subject: * lisp/progmodes/python.el: (python-nav--lisp-forward-sexp): New function. (python-nav--lisp-forward-sexp-safe): Use it. Rename from python-nav-lisp-forward-sexp-safe. (python-nav--forward-sexp): New argument SAFE allows switching forward sexp movement behavior for parens. (python-nav-forward-sexp): Throw errors on unterminated parens. (python-nav-backward-sexp, python-nav-forward-sexp-safe) (python-nav-backward-sexp-safe): New functions. (python-shell-buffer-substring): Use `python-nav-forward-sexp-safe'. * test/automated/python-tests.el (python-nav-lisp-forward-sexp-safe-1): Remove test. (python-nav-forward-sexp-safe-1): New test. Fixes: debbugs:16191 --- lisp/ChangeLog | 15 +++++++++ lisp/progmodes/python.el | 88 +++++++++++++++++++++++++++++++++++------------- 2 files changed, 79 insertions(+), 24 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b1a76998639..cc4000428fc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,18 @@ +2013-12-25 Fabián Ezequiel Gallina + + * progmodes/python.el: + (python-nav--lisp-forward-sexp): New function. + (python-nav--lisp-forward-sexp-safe): Use it. Rename from + python-nav-lisp-forward-sexp-safe. + (python-nav--forward-sexp): New argument SAFE allows switching + forward sexp movement behavior for parens. + (python-nav-forward-sexp): Throw errors on unterminated parens + (Bug#16191). + (python-nav-backward-sexp, python-nav-forward-sexp-safe) + (python-nav-backward-sexp-safe): New functions. + (python-shell-buffer-substring): Use + `python-nav-forward-sexp-safe'. + 2013-12-25 Lars Ingebrigtsen * net/shr.el (shr-find-fill-point): Don't break lines before a diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 07a8bba6b18..0646eade780 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -1424,25 +1424,36 @@ backward to previous block." (and (goto-char starting-pos) nil) (and (not (= (point) starting-pos)) (point-marker))))) -(defun python-nav-lisp-forward-sexp-safe (&optional arg) - "Safe version of standard `forward-sexp'. -When ARG > 0 move forward, else if ARG is < 0." - (or arg (setq arg 1)) +(defun python-nav--lisp-forward-sexp (&optional arg) + "Standard version `forward-sexp'. +It ignores completely the value of `forward-sexp-function' by +setting it to nil before calling `forward-sexp'. With positive +ARG move forward only one sexp, else move backwards." (let ((forward-sexp-function) - (paren-regexp - (if (> arg 0) (python-rx close-paren) (python-rx open-paren))) - (search-fn - (if (> arg 0) #'re-search-forward #'re-search-backward))) + (arg (if (or (not arg) (> arg 0)) 1 -1))) + (forward-sexp arg))) + +(defun python-nav--lisp-forward-sexp-safe (&optional arg) + "Safe version of standard `forward-sexp'. +When at end of sexp (i.e. looking at a opening/closing paren) +skips it instead of throwing an error. With positive ARG move +forward only one sexp, else move backwards." + (let* ((arg (if (or (not arg) (> arg 0)) 1 -1)) + (paren-regexp + (if (> arg 0) (python-rx close-paren) (python-rx open-paren))) + (search-fn + (if (> arg 0) #'re-search-forward #'re-search-backward))) (condition-case nil - (forward-sexp arg) + (python-nav--lisp-forward-sexp arg) (error (while (and (funcall search-fn paren-regexp nil t) (python-syntax-context 'paren))))))) -(defun python-nav--forward-sexp (&optional dir) +(defun python-nav--forward-sexp (&optional dir safe) "Move to forward sexp. -With positive Optional argument DIR direction move forward, else -backwards." +With positive optional argument DIR direction move forward, else +backwards. When optional argument SAFE is non-nil do not throw +errors when at end of sexp, skip it instead." (setq dir (or dir 1)) (unless (= dir 0) (let* ((forward-p (if (> dir 0) @@ -1460,7 +1471,9 @@ backwards." (eq (syntax-class (syntax-after (1- (point)))) (car (string-to-syntax ")"))))) ;; Inside a paren or looking at it, lisp knows what to do. - (python-nav-lisp-forward-sexp-safe dir)) + (if safe + (python-nav--lisp-forward-sexp-safe dir) + (python-nav--lisp-forward-sexp dir))) (t ;; This part handles the lispy feel of ;; `python-nav-forward-sexp'. Knowing everything about the @@ -1474,7 +1487,9 @@ backwards." ((python-info-end-of-statement-p) 'statement-end))) (next-sexp-pos (save-excursion - (python-nav-lisp-forward-sexp-safe dir) + (if safe + (python-nav--lisp-forward-sexp-safe dir) + (python-nav--lisp-forward-sexp dir)) (point))) (next-sexp-context (save-excursion @@ -1528,23 +1543,48 @@ backwards." (python-nav-beginning-of-statement)) (t (goto-char next-sexp-pos)))))))))) -(defun python-nav--backward-sexp () - "Move to backward sexp." - (python-nav--forward-sexp -1)) - (defun python-nav-forward-sexp (&optional arg) - "Move forward across one block of code. -With ARG, do it that many times. Negative arg -N means -move backward N times." + "Move forward across expressions. +With ARG, do it that many times. Negative arg -N means move +backward N times." + (interactive "^p") + (or arg (setq arg 1)) + (while (> arg 0) + (python-nav--forward-sexp 1) + (setq arg (1- arg))) + (while (< arg 0) + (python-nav--forward-sexp -1) + (setq arg (1+ arg)))) + +(defun python-nav-backward-sexp (&optional arg) + "Move backward across expressions. +With ARG, do it that many times. Negative arg -N means move +backward N times." + (interactive "^p") + (or arg (setq arg 1)) + (python-nav-forward-sexp (- arg))) + +(defun python-nav-forward-sexp-safe (&optional arg) + "Move forward safely across expressions. +With ARG, do it that many times. Negative arg -N means move +backward N times." (interactive "^p") (or arg (setq arg 1)) (while (> arg 0) - (python-nav--forward-sexp) + (python-nav--forward-sexp 1 t) (setq arg (1- arg))) (while (< arg 0) - (python-nav--backward-sexp) + (python-nav--forward-sexp -1 t) (setq arg (1+ arg)))) +(defun python-nav-backward-sexp-safe (&optional arg) + "Move backward safely across expressions. +With ARG, do it that many times. Negative arg -N means move +backward N times." + (interactive "^p") + (or arg (setq arg 1)) + (python-nav-forward-sexp-safe (- arg))) + (defun python-nav--up-list (&optional dir) "Internal implementation of `python-nav-up-list'. DIR is always 1 or -1 and comes sanitized from @@ -2212,7 +2252,7 @@ the python shell: (save-excursion (when (python-nav-if-name-main) (cons (point) - (progn (python-nav-forward-sexp) + (progn (python-nav-forward-sexp-safe) (point))))))) ;; Oh destructuring bind, how I miss you. (if-name-main-start (car if-name-main-start-end)) -- cgit v1.2.1 From c6c2058404759c6133950a4adb2827ab7d2cad3e Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Wed, 25 Dec 2013 19:14:49 +0100 Subject: Further shr quotation mark fill fixes (shr-char-kinsoku-bol-p): The quotation mark isn't a kinsoky BOL char. (shr-find-fill-point): Remove the special checks for the quotation mark, since `shr-char-kinsoku-bol-p' should now return the right thing. --- lisp/ChangeLog | 4 ++++ lisp/net/shr.el | 30 ++++++++++-------------------- 2 files changed, 14 insertions(+), 20 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cc4000428fc..eac7ee91360 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -17,6 +17,10 @@ * net/shr.el (shr-find-fill-point): Don't break lines before a quotation mark. + (shr-char-kinsoku-bol-p): The quotation mark isn't a kinsoky BOL char. + (shr-find-fill-point): Remove the special checks for the quotation + mark, since `shr-char-kinsoku-bol-p' should now return the right + thing. 2013-12-25 Kenjiro NAKAYAMA diff --git a/lisp/net/shr.el b/lisp/net/shr.el index bb7b7106c7b..fa4a41812d7 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -414,7 +414,9 @@ size, and full-buffer size." ;; of a line or the end of a line. (defmacro shr-char-kinsoku-bol-p (char) "Return non-nil if a line ought not to begin with CHAR." - `(aref (char-category-set ,char) ?>)) + `(let ((char ,char)) + (and (not (eq char ?')) + (aref (char-category-set char) ?>)))) (defmacro shr-char-kinsoku-eol-p (char) "Return non-nil if a line ought not to end with CHAR." `(aref (char-category-set ,char) ?<)) @@ -489,30 +491,19 @@ size, and full-buffer size." (eq (following-char) ? ) (shr-char-breakable-p (preceding-char)) (shr-char-breakable-p (following-char)) - (if (eq (preceding-char) ?') - (not (memq (char-after (- (point) 2)) - (list nil ?\n ? ))) - (and (shr-char-kinsoku-bol-p (preceding-char)) - (shr-char-breakable-p (following-char)) - (not (shr-char-kinsoku-bol-p (following-char))))) + (and (shr-char-kinsoku-bol-p (preceding-char)) + (shr-char-breakable-p (following-char)) + (not (shr-char-kinsoku-bol-p (following-char)))) (shr-char-kinsoku-eol-p (following-char)))) (backward-char 1)) - (if (and (not (or failed (eolp))) - (eq (preceding-char) ?')) - (while (not (or (setq failed (eolp)) - (eq (following-char) ? ) - (shr-char-breakable-p (following-char)) - (shr-char-kinsoku-eol-p (following-char)))) - (forward-char 1))) (if failed ;; There's no breakable point, so we give it up. (let (found) (goto-char bp) (unless shr-kinsoku-shorten - (while (and (setq found (re-search-forward - "\\(\\c>\\)\\| \\|\\c<\\|\\c|" - (line-end-position) 'move)) - (eq (preceding-char) ?'))) + (while (setq found (re-search-forward + "\\(\\c>\\)\\| \\|\\c<\\|\\c|" + (line-end-position) 'move))) (if (and found (not (match-beginning 1))) (goto-char (match-beginning 0))))) (or @@ -550,8 +541,7 @@ size, and full-buffer size." (if (looking-at "\\(\\c<+\\)\\c<") (goto-char (match-end 1)) (forward-char 1)))) - ((and (shr-char-kinsoku-bol-p (following-char)) - (not (eq (following-char) ?'))) + ((shr-char-kinsoku-bol-p (following-char)) ;; Find forward the point where kinsoku-bol characters end. (let ((count 4)) (while (progn -- cgit v1.2.1 From 3c856c14156c2bca051ee800b07e8e946dc97371 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Wed, 25 Dec 2013 20:37:41 +0100 Subject: * net/shr.el (shr-visit-file): Removed debugging function. --- lisp/ChangeLog | 4 ++++ lisp/net/shr.el | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index eac7ee91360..b0ca8f4bbf6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2013-12-25 Lars Ingebrigtsen + + * net/shr.el (shr-visit-file): Removed debugging function. + 2013-12-25 Fabián Ezequiel Gallina * progmodes/python.el: diff --git a/lisp/net/shr.el b/lisp/net/shr.el index fa4a41812d7..5b8ab28c837 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -179,13 +179,6 @@ cid: URL as the argument.") (goto-char begin) (shr-insert-document dom)))) -(defun shr-visit-file (file) - "Parse FILE as an HTML document, and render it in a new buffer." - (interactive "fHTML file name: ") - (with-temp-buffer - (insert-file-contents file) - (shr-render-buffer (current-buffer)))) - ;;;###autoload (defun shr-insert-document (dom) "Render the parsed document DOM into the current buffer. -- cgit v1.2.1 From 83fa295c1236aba5a73d565082dcb58a32f3e446 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Wed, 25 Dec 2013 20:38:08 +0100 Subject: Grammer fix --- lisp/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b0ca8f4bbf6..45c2154db0e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,6 @@ 2013-12-25 Lars Ingebrigtsen - * net/shr.el (shr-visit-file): Removed debugging function. + * net/shr.el (shr-visit-file): Remove debugging function. 2013-12-25 Fabián Ezequiel Gallina -- cgit v1.2.1