From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?ISO-8859-1?Q?R=FCdiger?= Sonderfeld Newsgroups: gmane.emacs.devel Subject: [PATCH 3/5] eww: Use `setq-local'. Date: Fri, 20 Dec 2013 00:44:43 +0100 Message-ID: <3889158.NetLtzTgG9@descartes> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit X-Trace: ger.gmane.org 1387496726 13647 80.91.229.3 (19 Dec 2013 23:45:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 19 Dec 2013 23:45:26 +0000 (UTC) Cc: Lars Magne Ingebrigtsen , Ted Zlatanov To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 20 00:45:31 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VtnHV-0002Xs-0n for ged-emacs-devel@m.gmane.org; Fri, 20 Dec 2013 00:45:29 +0100 Original-Received: from localhost ([::1]:46913 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtnHU-0002Bi-Km for ged-emacs-devel@m.gmane.org; Thu, 19 Dec 2013 18:45:28 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtnH0-0001K4-VY for emacs-devel@gnu.org; Thu, 19 Dec 2013 18:45:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VtnGs-0002ZR-9A for emacs-devel@gnu.org; Thu, 19 Dec 2013 18:44:58 -0500 Original-Received: from ptmx.org ([178.63.28.110]:33848) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtnGs-0002Z9-2s for emacs-devel@gnu.org; Thu, 19 Dec 2013 18:44:50 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by ptmx.org (Postfix) with ESMTP id 9087E22ACB; Fri, 20 Dec 2013 00:44:49 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at ptmx.org Original-Received: from ptmx.org ([127.0.0.1]) by localhost (ptmx.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kXCb6Y1QLn46; Fri, 20 Dec 2013 00:44:48 +0100 (CET) Original-Received: from descartes.localnet (chello080108246092.7.14.vie.surfer.at [80.108.246.92]) by ptmx.org (Postfix) with ESMTPSA id F20FA2130B; Fri, 20 Dec 2013 00:44:47 +0100 (CET) User-Agent: KMail/4.11.2 (Linux/3.11.0-14-generic; KDE/4.11.2; x86_64; ; ) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 178.63.28.110 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:166633 Archived-At: * lisp/net/eww.el (eww-render, eww-mode): Use `setq-local'. --- lisp/ChangeLog | 1 + lisp/net/eww.el | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cf8553d..54f6c77 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -6,6 +6,7 @@ (eww-bookmark-browse, eww-next-bookmark, eww-previous-bookmark): Use `user-error'. (eww-bookmark-mode-map): Add menu. + (eww-render, eww-mode): Use `setq-local'. 2013-12-19 Teodor Zlatanov diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 1da2bb2..a58b7ed 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -171,12 +171,12 @@ (defun eww-render (status url &optional point) (let ((redirect (plist-get status :redirect))) (when redirect (setq url redirect))) - (set (make-local-variable 'eww-next-url) nil) - (set (make-local-variable 'eww-previous-url) nil) - (set (make-local-variable 'eww-up-url) nil) - (set (make-local-variable 'eww-home-url) nil) - (set (make-local-variable 'eww-start-url) nil) - (set (make-local-variable 'eww-contents-url) nil) + (setq-local eww-next-url nil) + (setq-local eww-previous-url nil) + (setq-local eww-up-url nil) + (setq-local eww-home-url nil) + (setq-local eww-start-url nil) + (setq-local eww-contents-url nil) (let* ((headers (eww-parse-headers)) (content-type (mail-header-parse-content-type @@ -443,13 +443,13 @@ (define-derived-mode eww-mode nil "eww" \\{eww-mode-map}" ;; FIXME? This seems a strange default. - (set (make-local-variable 'eww-current-url) 'author) - (set (make-local-variable 'eww-current-dom) nil) - (set (make-local-variable 'eww-current-source) nil) - (set (make-local-variable 'browse-url-browser-function) 'eww-browse-url) - (set (make-local-variable 'after-change-functions) 'eww-process-text-input) - (set (make-local-variable 'eww-history) nil) - (set (make-local-variable 'eww-history-position) 0) + (setq-local eww-current-url 'author) + (setq-local eww-current-dom nil) + (setq-local eww-current-source nil) + (setq-local browse-url-browser-function 'eww-browse-url) + (setq-local after-change-functions 'eww-process-text-input) + (setq-local eww-history nil) + (setq-local eww-history-position 0) (buffer-disable-undo) ;;(setq buffer-read-only t) ) -- 1.8.5