From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: [PATCH] org-plist-delete rewrite Date: Mon, 3 Jan 2011 13:22:16 +0100 Message-ID: References: <1293209207-25615-1-git-send-email-julien@danjou.info> Mime-Version: 1.0 (Apple Message framework v936) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Return-path: Received: from [140.186.70.92] (port=35686 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZjQe-0008D2-3U for emacs-orgmode@gnu.org; Mon, 03 Jan 2011 07:22:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PZjQa-0007oZ-My for emacs-orgmode@gnu.org; Mon, 03 Jan 2011 07:22:23 -0500 Received: from mail-ey0-f169.google.com ([209.85.215.169]:60312) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PZjQa-0007oC-IH for emacs-orgmode@gnu.org; Mon, 03 Jan 2011 07:22:20 -0500 Received: by eyh6 with SMTP id 6so2840615eyh.0 for ; Mon, 03 Jan 2011 04:22:19 -0800 (PST) In-Reply-To: <1293209207-25615-1-git-send-email-julien@danjou.info> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Julien Danjou Cc: emacs-orgmode@gnu.org I removed the duplicate definition. Thanks. - Carsten On Dec 24, 2010, at 5:46 PM, Julien Danjou wrote: > * org-macs.el (org-plist-delete): Rewrite faster. > > * org.el (org-plist-delete): Remove duplicate from org-macs.el. > > Signed-off-by: Julien Danjou > --- > lisp/org-macs.el | 16 +++++++--------- > lisp/org.el | 10 ---------- > 2 files changed, 7 insertions(+), 19 deletions(-) > > diff --git a/lisp/org-macs.el b/lisp/org-macs.el > index 97a8fdc..608c0d7 100644 > --- a/lisp/org-macs.el > +++ b/lisp/org-macs.el > @@ -289,15 +289,13 @@ we turn off invisibility temporarily. Use > this in a `let' form." > (goto-char (point-at-bol)) > (looking-at re))) > > -(defun org-plist-delete (plist property) > - "Delete PROPERTY from PLIST. > -This is in contrast to merely setting it to 0." > - (let (p) > - (while plist > - (if (not (eq property (car plist))) > - (setq p (plist-put p (car plist) (nth 1 plist)))) > - (setq plist (cddr plist))) > - p)) > +(defun org-plist-delete (plist prop) > + "Delete PROPERTY from PLIST." > + (let ((p (memq prop plist))) > + (if (not p) > + plist > + (setcdr p (cddr p)) > + (delq prop plist)))) > > (defun org-replace-match-keep-properties (newtext &optional fixedcase > literal string) > diff --git a/lisp/org.el b/lisp/org.el > index 5fb2ba4..dd18189 100644 > --- a/lisp/org.el > +++ b/lisp/org.el > @@ -17995,16 +17995,6 @@ With prefix arg UNCOMPILED, load the > uncompiled versions." > (concat "\"" (mapconcat 'identity (split-string s "\"") > "\"\"") "\"") > s)) > > -(defun org-plist-delete (plist property) > - "Delete PROPERTY from PLIST. > -This is in contrast to merely setting it to 0." > - (let (p) > - (while plist > - (if (not (eq property (car plist))) > - (setq p (plist-put p (car plist) (nth 1 plist)))) > - (setq plist (cddr plist))) > - p)) > - > (defun org-force-self-insert (N) > "Needed to enforce self-insert under remapping." > (interactive "p") > -- > 1.7.2.3 > > > _______________________________________________ > Emacs-orgmode mailing list > Please use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode - Carsten