Просмотр исходного кода

org-table: Remove command status for some functions

* lisp/org-table.el (org-table-current-column):
(org-table-current-dline): Do not allow to call these functions
interactively.  `org-table-field-info' should be used instead.
* lisp/org-capture.el (org-encrypt-entry): Silence byte-compiler.
Nicolas Goaziou 9 лет назад
Родитель
Сommit
0ca32a2838
2 измененных файлов с 1 добавлено и 10 удалено
  1. 1 0
      lisp/org-capture.el
  2. 0 10
      lisp/org-table.el

+ 1 - 0
lisp/org-capture.el

@@ -56,6 +56,7 @@
 (declare-function org-decrypt-entry "org-crypt" ())
 (declare-function org-decrypt-entry "org-crypt" ())
 (declare-function org-encrypt-entry "org-crypt" ())
 (declare-function org-encrypt-entry "org-crypt" ())
 (declare-function org-table-analyze "org-table" ())
 (declare-function org-table-analyze "org-table" ())
+(declare-function org-table-current-dline "org-table" ())
 (declare-function org-table-goto-line "org-table" (N))
 (declare-function org-table-goto-line "org-table" (N))
 
 
 (defvar org-end-time-was-given)
 (defvar org-end-time-was-given)

+ 0 - 10
lisp/org-table.el

@@ -1317,23 +1317,15 @@ is always the old value."
 
 
 (defun org-table-current-column ()
 (defun org-table-current-column ()
   "Find out which column we are in."
   "Find out which column we are in."
-  (interactive)
-  (when (called-interactively-p 'any) (org-table-check-inside-data-field))
   (save-excursion
   (save-excursion
     (let ((column 0) (pos (point)))
     (let ((column 0) (pos (point)))
       (beginning-of-line)
       (beginning-of-line)
       (while (search-forward "|" pos t) (cl-incf column))
       (while (search-forward "|" pos t) (cl-incf column))
-      (when (called-interactively-p 'interactive)
-	(message "In table column %d" column))
       column)))
       column)))
 
 
-;;;###autoload
 (defun org-table-current-dline ()
 (defun org-table-current-dline ()
   "Find out what table data line we are in.
   "Find out what table data line we are in.
 Only data lines count for this."
 Only data lines count for this."
-  (interactive)
-  (when (called-interactively-p 'any)
-    (org-table-check-inside-data-field))
   (save-excursion
   (save-excursion
     (let ((c 0)
     (let ((c 0)
 	  (pos (point)))
 	  (pos (point)))
@@ -1341,8 +1333,6 @@ Only data lines count for this."
       (while (<= (point) pos)
       (while (<= (point) pos)
 	(when (looking-at org-table-dataline-regexp) (cl-incf c))
 	(when (looking-at org-table-dataline-regexp) (cl-incf c))
 	(forward-line))
 	(forward-line))
-      (when (called-interactively-p 'any)
-	(message "This is table line %d" c))
       c)))
       c)))
 
 
 ;;;###autoload
 ;;;###autoload