From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Sperber Subject: Only use `visual-line-mode if it's bound`[WAS: Current patches for XEmacs] Date: Sat, 07 Apr 2012 21:00:35 +0200 Message-ID: References: <87sjgigcu9.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([208.118.235.92]:37483) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SGasR-0003pP-Ch for emacs-orgmode@gnu.org; Sat, 07 Apr 2012 15:00:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SGasP-0007uk-NZ for emacs-orgmode@gnu.org; Sat, 07 Apr 2012 15:00:46 -0400 Received: from plane.gmane.org ([80.91.229.3]:54504) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SGasP-0007uU-Gz for emacs-orgmode@gnu.org; Sat, 07 Apr 2012 15:00:45 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1SGasM-0007D9-Hr for emacs-orgmode@gnu.org; Sat, 07 Apr 2012 21:00:42 +0200 Received: from dslb-088-070-150-189.pools.arcor-ip.net ([88.70.150.189]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 07 Apr 2012 21:00:42 +0200 Received: from sperber by dslb-088-070-150-189.pools.arcor-ip.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 07 Apr 2012 21:00:42 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Bastien writes: > Can you send each patch in a separate email using > `git format-patch'? Attached. The second one will follow shortly. -- Cheers =8-} Mike Friede, Völkerverständigung und überhaupt blabla --=-=-= Content-Disposition: inline >From 18a83ce61fb420e85987e77f8506c01023a22c16 Mon Sep 17 00:00:00 2001 From: Mike Sperber Date: Wed, 4 Apr 2012 09:48:05 +0200 Subject: [PATCH] Only use `visual-line-mode' if it's bound. * org.el (org-kill-line): Access `visual-line-mode' only if it's bound. --- lisp/org.el | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index b83700f..8d9d793 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -20793,7 +20793,7 @@ depending on context." (not (y-or-n-p "Kill hidden subtree along with headline? "))) (error "C-k aborted - would kill hidden subtree"))) (call-interactively - (if visual-line-mode 'kill-visual-line 'kill-line))) + (if (and (boundp 'visual-line-mode) visual-line-mode) 'kill-visual-line 'kill-line))) ((looking-at (org-re ".*?\\S-\\([ \t]+\\(:[[:alnum:]_@#%:]+:\\)\\)[ \t]*$")) (kill-region (point) (match-beginning 1)) (org-set-tags nil t)) -- 1.7.0.5 --=-=-=--