diff options
author | Bastien Guerry <bzg@altern.org> | 2011-01-31 18:40:05 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2011-01-31 18:40:05 +0100 |
commit | df23e58b48e3bc52cb156ee14a87191ca8353e6f (patch) | |
tree | cb3b2e3e70ccb4904bbba59c7ce26d90c3194690 | |
parent | 9511f9e153c4e4d654e6c2c6ee28a21d84fa2770 (diff) | |
download | org-mode-df23e58b48e3bc52cb156ee14a87191ca8353e6f.tar.gz |
Rename org-complete.el to org-pcomplete.el to avoid file-name clash.
On Jan 26, 2011, at 10:34 AM, Eli Zaretskii wrote:
> The file org-complete.el, added about a month ago, causes a file-name
> clash with org-compat.el after 8+3 truncation. This causes trouble
> when unpacking Emacs tarballs on DOS filesystems.
Also rename org-complete-* functions in org-pcomplete.el and remove a
wrong reference to org-complete in doc/org.texi.
We still use org-complete-* namespace for the custom group and the
custom variables.
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | doc/org.texi | 2 | ||||
-rw-r--r-- | lisp/ChangeLog | 10 | ||||
-rw-r--r-- | lisp/org-pcomplete.el (renamed from lisp/org-complete.el) | 14 | ||||
-rw-r--r-- | lisp/org.el | 7 |
5 files changed, 24 insertions, 11 deletions
@@ -71,7 +71,7 @@ LISPF = org.el \ org-colview.el \ org-colview-xemacs.el \ org-compat.el \ - org-complete.el \ + org-pcomplete.el \ org-crypt.el \ org-ctags.el \ org-datetree.el \ diff --git a/doc/org.texi b/doc/org.texi index eaae801..e3dab90 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -4670,7 +4670,7 @@ Org files. The following commands help to work with properties: @table @kbd -@orgcmd{M-@key{TAB},org-complete} +@orgcmd{M-@key{TAB},pcomplete} After an initial colon in a line, complete property keys. All keys used in the current file will be offered as possible completions. @orgcmd{C-c C-x p,org-set-property} diff --git a/lisp/ChangeLog b/lisp/ChangeLog new file mode 100644 index 0000000..7e2a23f --- /dev/null +++ b/lisp/ChangeLog @@ -0,0 +1,10 @@ +2011-01-18 Bastien Guerry <bzg@altern.org> + + * org.el (org-fast-tag-selection): Fix bug when assigning keys + for fast tag selection. + +2011-01-17 Bastien Guerry <bzg@altern.org> + + * org-latex.el (org-export-latex-make-header): Fix inclusion + of email. + diff --git a/lisp/org-complete.el b/lisp/org-pcomplete.el index 5959ba1..e8ca908 100644 --- a/lisp/org-complete.el +++ b/lisp/org-pcomplete.el @@ -1,4 +1,4 @@ -;;; org-complete.el --- In-buffer completion code +;;; org-pcomplete.el --- In-buffer completion code ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 ;; Free Software Foundation, Inc. @@ -47,7 +47,7 @@ ;;;; Customization variables -(defgroup org-complete nil +(defgroup org-pcomplete nil "Outline-based notes management and organizer." :tag "Org" :group 'org) @@ -122,7 +122,7 @@ When completing for #+STARTUP, for example, this function returns (cons (reverse args) (reverse begins)))))) -(defun org-complete-initial () +(defun org-pcomplete-initial () "Calls the right completion function for first argument completions." (ignore (funcall (or (pcomplete-find-completion-function @@ -134,7 +134,7 @@ When completing for #+STARTUP, for example, this function returns "Complete against all valid file options." (require 'org-exp) (pcomplete-here - (org-complete-case-double + (org-pcomplete-case-double (mapcar (lambda (x) (if (= ?: (aref x (1- (length x)))) (concat x " ") @@ -266,7 +266,7 @@ Complete a language in the first field, the header arguments and switches." ":tcolumns" ":level" ":compact" ":timestamp" ":formula" ":formatter")))) -(defun org-complete-case-double (list) +(defun org-pcomplete-case-double (list) "Return list with both upcase and downcase version of all strings in LIST." (let (e res) (while (setq e (pop list)) @@ -275,8 +275,8 @@ Complete a language in the first field, the header arguments and switches." ;;;; Finish up -(provide 'org-complete) +(provide 'org-pcomplete) ;; arch-tag: -;;; org-complete.el ends here +;;; org-pcomplete.el ends here diff --git a/lisp/org.el b/lisp/org.el index a49d3e2..808c9ed 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -99,7 +99,7 @@ (require 'org-compat) (require 'org-faces) (require 'org-list) -(require 'org-complete) +(require 'org-pcomplete) (require 'org-src) (require 'org-footnote) @@ -4764,7 +4764,7 @@ The following commands are available: ;; Setup the pcomplete hooks (set (make-local-variable 'pcomplete-command-completion-function) - 'org-complete-initial) + 'org-pcomplete-initial) (set (make-local-variable 'pcomplete-command-name-function) 'org-command-at-point) (set (make-local-variable 'pcomplete-default-completion-function) @@ -18476,6 +18476,9 @@ Taken from `count' in cl-seq.el with all keyword arguments removed." Returns the number of empty lines passed." (let ((pos (point))) (skip-chars-backward " \t\n\r") + ;; (if (cdr (assoc 'heading org-blank-before-new-entry)) + ;; (skip-chars-backward " \t\n\r") + ;; (forward-line -1)) (beginning-of-line 2) (goto-char (min (point) pos)) (count-lines (point) pos))) |