emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* [PATCH] Fixed compiler warnings including typo in ob-lilypond
@ 2012-03-16  5:55 Ilya Shlyakhter
  2012-03-16 14:36 ` [PATCH] Fixed compiler warnings including one small bug " Ilya Shlyakhter
  0 siblings, 1 reply; 5+ messages in thread
From: Ilya Shlyakhter @ 2012-03-16  5:55 UTC (permalink / raw)
  To: emacs-orgmode


[-- Attachment #1.1: Type: text/plain, Size: 421 bytes --]

Fixed compiler warnings, including one typo in ob-lilypond



* lisp/ob-lilypond.el (ly-compile-lilyfile): Fixed misplaced comma in a

quoting expression.



* lisp/org-pcomplete.el: added missing defvar definitions for org vars



* lisp/org-src.el: added declare-function line for org-babel-tangle



* lisp/ob.el (org-scan-tags): protected the variable tags-list with a let

(other) added missing defvar declarations.

[-- Attachment #1.2: Type: text/html, Size: 1472 bytes --]

[-- Attachment #2: 0001-Fixed-compiler-warnings-including-one-typo-in-ob-lil.patch --]
[-- Type: application/octet-stream, Size: 4485 bytes --]

From d0579b6e104b82ec7d3255086384ff8dee0d4e0e Mon Sep 17 00:00:00 2001
From: Ilya Shlyakhter <ilya_shl@alum.mit.edu>
Date: Fri, 16 Mar 2012 01:52:03 -0400
Subject: [PATCH] Fixed compiler warnings, including one typo in ob-lilypond

* lisp/ob-lilypond.el (ly-compile-lilyfile): Fixed misplaced comma in a
quoting expression.

* lisp/org-pcomplete.el: added missing defvar definitions for org vars

* lisp/org-src.el: added declare-function line for org-babel-tangle

* lisp/ob.el (org-scan-tags): protected the variable tags-list with a let
(other) added missing defvar declarations.
---
 lisp/ob-lilypond.el   |    2 +-
 lisp/org-pcomplete.el |    5 +++++
 lisp/org-src.el       |    2 ++
 lisp/org.el           |    9 +++++++--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el
index a008b2d..0e9b0c6 100644
--- a/lisp/ob-lilypond.el
+++ b/lisp/ob-lilypond.el
@@ -223,7 +223,7 @@ FILE-NAME is full path to lilypond (.ly) file"
         (arg-11 file-name))
     (if test
         `(,arg-1 ,arg-2 ,arg-3 ,arg-4 ,arg-5 ,arg-6
-                 ,arg-7 ,arg-8 ,arg-9 ,arg-10, arg-11)
+                 ,arg-7 ,arg-8 ,arg-9 ,arg-10 ,arg-11)
       (call-process
        arg-1 arg-2 arg-3 arg-4 arg-5 arg-6
        arg-7 arg-8 arg-9 arg-10 arg-11))))
diff --git a/lisp/org-pcomplete.el b/lisp/org-pcomplete.el
index c475bcc..7a4dc0d 100644
--- a/lisp/org-pcomplete.el
+++ b/lisp/org-pcomplete.el
@@ -50,6 +50,9 @@
   :tag "Org"
   :group 'org)
 
+(defvar org-drawer-regexp)
+(defvar org-property-re)
+
 (defun org-thing-at-point ()
   "Examine the thing at point and let the caller know what it is.
 The return value is a string naming the thing at point."
@@ -247,6 +250,8 @@ This needs more work, to handle headings with lots of spaces in them."
 	     lst))
    (substring pcomplete-stub 1)))
 
+(defvar org-drawers)
+
 (defun pcomplete/org-mode/drawer ()
   "Complete a drawer name."
   (let ((spc (save-excursion
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 88217cd..cc5a6ca 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -686,6 +686,8 @@ the language, a switch telling if the content should be in a single line."
   (interactive)
   (org-src-in-org-buffer (save-buffer)))
 
+(declare-function org-babel-tangle "ob-tangle" (&optional only-this-block target-file lang))
+
 (defun org-src-tangle (arg)
   "Tangle the parent buffer."
   (interactive)
diff --git a/lisp/org.el b/lisp/org.el
index 951f692..7f8eddb 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -76,6 +76,7 @@
   (require 'gnus-sum))
 
 (require 'calendar)
+(require 'format-spec)
 
 ;; Emacs 22 calendar compatibility:  Make sure the new variables are available
 (when (fboundp 'defvaralias)
@@ -4930,6 +4931,8 @@ sure that we are at the beginning of the line.")
   "Matches an headline, putting stars and text into groups.
 Stars are put in group 1 and the trimmed body in group 2.")
 
+(defvar bidi-paragraph-direction)
+
 ;;;###autoload
 (define-derived-mode org-mode outline-mode "Org"
   "Outline-based notes management and organizer, alias
@@ -12854,7 +12857,7 @@ headlines matching this string."
 				   (buffer-name (buffer-base-buffer)))))))
 	 (case-fold-search nil)
 	 (org-map-continue-from nil)
-         lspos tags
+         lspos tags tags-list
 	 (tags-alist (list (cons 0 org-file-tags)))
 	 (llast 0) rtn rtn1 level category i txt
 	 todo marker entry priority)
@@ -14986,6 +14989,7 @@ So these are more for recording a certain time/date."
 (defvar org-read-date-final-answer nil)
 (defvar org-read-date-analyze-futurep nil)
 (defvar org-read-date-analyze-forced-year nil)
+(defvar org-read-date-inactive)
 
 (defun org-read-date (&optional with-time to-time from-string prompt
 				default-time default-input inactive)
@@ -15185,7 +15189,6 @@ user."
 (defvar def)
 (defvar defdecode)
 (defvar with-time)
-(defvar org-read-date-inactive)
 (defun org-read-date-display ()
   "Display the current date prompt interpretation in the minibuffer."
   (when org-read-date-display-live
@@ -17008,6 +17011,8 @@ Some of the options can be changed using the variable
 	      (error "Unknown conversion type %s for latex fragments"
 		     processing-type)))))))))
 
+(declare-function format-spec "format-spec" (format specification))
+
 (defun org-create-math-formula (latex-frag &optional mathml-file)
   "Convert LATEX-FRAG to MathML and store it in MATHML-FILE.
 Use `org-latex-to-mathml-convert-command'.  If the conversion is
-- 
1.7.9.3


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH] Fixed compiler warnings including one small bug in ob-lilypond
  2012-03-16  5:55 [PATCH] Fixed compiler warnings including typo in ob-lilypond Ilya Shlyakhter
@ 2012-03-16 14:36 ` Ilya Shlyakhter
  2012-03-16 14:48   ` Eric Schulte
  2012-03-16 18:46   ` Achim Gratz
  0 siblings, 2 replies; 5+ messages in thread
From: Ilya Shlyakhter @ 2012-03-16 14:36 UTC (permalink / raw)
  To: emacs-orgmode

[-- Attachment #1: Type: text/plain, Size: 104 bytes --]

Re-sending the patch as a correct attachment type.
One of the warnings indicated an actual (small) bug.

[-- Attachment #2: 0001-Fixed-compiler-warnings-including-one-typo-in-ob-lil.patch --]
[-- Type: text/plain, Size: 4502 bytes --]

From d0579b6e104b82ec7d3255086384ff8dee0d4e0e Mon Sep 17 00:00:00 2001
From: Ilya Shlyakhter <ilya_shl@alum.mit.edu>
Date: Fri, 16 Mar 2012 01:52:03 -0400
Subject: [PATCH] Fixed compiler warnings, including one small bug in ob-lilypond

* lisp/ob-lilypond.el (ly-compile-lilyfile): Fixed misplaced comma in a
quoting expression.

* lisp/org-pcomplete.el: added missing defvar definitions for org vars

* lisp/org-src.el: added declare-function line for org-babel-tangle

* lisp/ob.el (org-scan-tags): protected the variable tags-list with a let
(other) added missing defvar declarations.

TINYCHANGE
---
 lisp/ob-lilypond.el   |    2 +-
 lisp/org-pcomplete.el |    5 +++++
 lisp/org-src.el       |    2 ++
 lisp/org.el           |    9 +++++++--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el
index a008b2d..0e9b0c6 100644
--- a/lisp/ob-lilypond.el
+++ b/lisp/ob-lilypond.el
@@ -223,7 +223,7 @@ FILE-NAME is full path to lilypond (.ly) file"
         (arg-11 file-name))
     (if test
         `(,arg-1 ,arg-2 ,arg-3 ,arg-4 ,arg-5 ,arg-6
-                 ,arg-7 ,arg-8 ,arg-9 ,arg-10, arg-11)
+                 ,arg-7 ,arg-8 ,arg-9 ,arg-10 ,arg-11)
       (call-process
        arg-1 arg-2 arg-3 arg-4 arg-5 arg-6
        arg-7 arg-8 arg-9 arg-10 arg-11))))
diff --git a/lisp/org-pcomplete.el b/lisp/org-pcomplete.el
index c475bcc..7a4dc0d 100644
--- a/lisp/org-pcomplete.el
+++ b/lisp/org-pcomplete.el
@@ -50,6 +50,9 @@
   :tag "Org"
   :group 'org)
 
+(defvar org-drawer-regexp)
+(defvar org-property-re)
+
 (defun org-thing-at-point ()
   "Examine the thing at point and let the caller know what it is.
 The return value is a string naming the thing at point."
@@ -247,6 +250,8 @@ This needs more work, to handle headings with lots of spaces in them."
 	     lst))
    (substring pcomplete-stub 1)))
 
+(defvar org-drawers)
+
 (defun pcomplete/org-mode/drawer ()
   "Complete a drawer name."
   (let ((spc (save-excursion
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 88217cd..cc5a6ca 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -686,6 +686,8 @@ the language, a switch telling if the content should be in a single line."
   (interactive)
   (org-src-in-org-buffer (save-buffer)))
 
+(declare-function org-babel-tangle "ob-tangle" (&optional only-this-block target-file lang))
+
 (defun org-src-tangle (arg)
   "Tangle the parent buffer."
   (interactive)
diff --git a/lisp/org.el b/lisp/org.el
index 951f692..7f8eddb 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -76,6 +76,7 @@
   (require 'gnus-sum))
 
 (require 'calendar)
+(require 'format-spec)
 
 ;; Emacs 22 calendar compatibility:  Make sure the new variables are available
 (when (fboundp 'defvaralias)
@@ -4930,6 +4931,8 @@ sure that we are at the beginning of the line.")
   "Matches an headline, putting stars and text into groups.
 Stars are put in group 1 and the trimmed body in group 2.")
 
+(defvar bidi-paragraph-direction)
+
 ;;;###autoload
 (define-derived-mode org-mode outline-mode "Org"
   "Outline-based notes management and organizer, alias
@@ -12854,7 +12857,7 @@ headlines matching this string."
 				   (buffer-name (buffer-base-buffer)))))))
 	 (case-fold-search nil)
 	 (org-map-continue-from nil)
-         lspos tags
+         lspos tags tags-list
 	 (tags-alist (list (cons 0 org-file-tags)))
 	 (llast 0) rtn rtn1 level category i txt
 	 todo marker entry priority)
@@ -14986,6 +14989,7 @@ So these are more for recording a certain time/date."
 (defvar org-read-date-final-answer nil)
 (defvar org-read-date-analyze-futurep nil)
 (defvar org-read-date-analyze-forced-year nil)
+(defvar org-read-date-inactive)
 
 (defun org-read-date (&optional with-time to-time from-string prompt
 				default-time default-input inactive)
@@ -15185,7 +15189,6 @@ user."
 (defvar def)
 (defvar defdecode)
 (defvar with-time)
-(defvar org-read-date-inactive)
 (defun org-read-date-display ()
   "Display the current date prompt interpretation in the minibuffer."
   (when org-read-date-display-live
@@ -17008,6 +17011,8 @@ Some of the options can be changed using the variable
 	      (error "Unknown conversion type %s for latex fragments"
 		     processing-type)))))))))
 
+(declare-function format-spec "format-spec" (format specification))
+
 (defun org-create-math-formula (latex-frag &optional mathml-file)
   "Convert LATEX-FRAG to MathML and store it in MATHML-FILE.
 Use `org-latex-to-mathml-convert-command'.  If the conversion is
-- 
1.7.9.3


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Fixed compiler warnings including one small bug in ob-lilypond
  2012-03-16 14:36 ` [PATCH] Fixed compiler warnings including one small bug " Ilya Shlyakhter
@ 2012-03-16 14:48   ` Eric Schulte
  2012-03-16 18:46   ` Achim Gratz
  1 sibling, 0 replies; 5+ messages in thread
From: Eric Schulte @ 2012-03-16 14:48 UTC (permalink / raw)
  To: Ilya Shlyakhter; +Cc: emacs-orgmode

Applied, Thanks!

Ilya Shlyakhter <ilya_shl@alum.mit.edu> writes:

> Re-sending the patch as a correct attachment type.
> One of the warnings indicated an actual (small) bug.
>
> From d0579b6e104b82ec7d3255086384ff8dee0d4e0e Mon Sep 17 00:00:00 2001
> From: Ilya Shlyakhter <ilya_shl@alum.mit.edu>
> Date: Fri, 16 Mar 2012 01:52:03 -0400
> Subject: [PATCH] Fixed compiler warnings, including one small bug in ob-lilypond
>
> * lisp/ob-lilypond.el (ly-compile-lilyfile): Fixed misplaced comma in a
> quoting expression.
>
> * lisp/org-pcomplete.el: added missing defvar definitions for org vars
>
> * lisp/org-src.el: added declare-function line for org-babel-tangle
>
> * lisp/ob.el (org-scan-tags): protected the variable tags-list with a let
> (other) added missing defvar declarations.
>
> TINYCHANGE
> ---
>  lisp/ob-lilypond.el   |    2 +-
>  lisp/org-pcomplete.el |    5 +++++
>  lisp/org-src.el       |    2 ++
>  lisp/org.el           |    9 +++++++--
>  4 files changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el
> index a008b2d..0e9b0c6 100644
> --- a/lisp/ob-lilypond.el
> +++ b/lisp/ob-lilypond.el
> @@ -223,7 +223,7 @@ FILE-NAME is full path to lilypond (.ly) file"
>          (arg-11 file-name))
>      (if test
>          `(,arg-1 ,arg-2 ,arg-3 ,arg-4 ,arg-5 ,arg-6
> -                 ,arg-7 ,arg-8 ,arg-9 ,arg-10, arg-11)
> +                 ,arg-7 ,arg-8 ,arg-9 ,arg-10 ,arg-11)
>        (call-process
>         arg-1 arg-2 arg-3 arg-4 arg-5 arg-6
>         arg-7 arg-8 arg-9 arg-10 arg-11))))
> diff --git a/lisp/org-pcomplete.el b/lisp/org-pcomplete.el
> index c475bcc..7a4dc0d 100644
> --- a/lisp/org-pcomplete.el
> +++ b/lisp/org-pcomplete.el
> @@ -50,6 +50,9 @@
>    :tag "Org"
>    :group 'org)
>  
> +(defvar org-drawer-regexp)
> +(defvar org-property-re)
> +
>  (defun org-thing-at-point ()
>    "Examine the thing at point and let the caller know what it is.
>  The return value is a string naming the thing at point."
> @@ -247,6 +250,8 @@ This needs more work, to handle headings with lots of spaces in them."
>  	     lst))
>     (substring pcomplete-stub 1)))
>  
> +(defvar org-drawers)
> +
>  (defun pcomplete/org-mode/drawer ()
>    "Complete a drawer name."
>    (let ((spc (save-excursion
> diff --git a/lisp/org-src.el b/lisp/org-src.el
> index 88217cd..cc5a6ca 100644
> --- a/lisp/org-src.el
> +++ b/lisp/org-src.el
> @@ -686,6 +686,8 @@ the language, a switch telling if the content should be in a single line."
>    (interactive)
>    (org-src-in-org-buffer (save-buffer)))
>  
> +(declare-function org-babel-tangle "ob-tangle" (&optional only-this-block target-file lang))
> +
>  (defun org-src-tangle (arg)
>    "Tangle the parent buffer."
>    (interactive)
> diff --git a/lisp/org.el b/lisp/org.el
> index 951f692..7f8eddb 100644
> --- a/lisp/org.el
> +++ b/lisp/org.el
> @@ -76,6 +76,7 @@
>    (require 'gnus-sum))
>  
>  (require 'calendar)
> +(require 'format-spec)
>  
>  ;; Emacs 22 calendar compatibility:  Make sure the new variables are available
>  (when (fboundp 'defvaralias)
> @@ -4930,6 +4931,8 @@ sure that we are at the beginning of the line.")
>    "Matches an headline, putting stars and text into groups.
>  Stars are put in group 1 and the trimmed body in group 2.")
>  
> +(defvar bidi-paragraph-direction)
> +
>  ;;;###autoload
>  (define-derived-mode org-mode outline-mode "Org"
>    "Outline-based notes management and organizer, alias
> @@ -12854,7 +12857,7 @@ headlines matching this string."
>  				   (buffer-name (buffer-base-buffer)))))))
>  	 (case-fold-search nil)
>  	 (org-map-continue-from nil)
> -         lspos tags
> +         lspos tags tags-list
>  	 (tags-alist (list (cons 0 org-file-tags)))
>  	 (llast 0) rtn rtn1 level category i txt
>  	 todo marker entry priority)
> @@ -14986,6 +14989,7 @@ So these are more for recording a certain time/date."
>  (defvar org-read-date-final-answer nil)
>  (defvar org-read-date-analyze-futurep nil)
>  (defvar org-read-date-analyze-forced-year nil)
> +(defvar org-read-date-inactive)
>  
>  (defun org-read-date (&optional with-time to-time from-string prompt
>  				default-time default-input inactive)
> @@ -15185,7 +15189,6 @@ user."
>  (defvar def)
>  (defvar defdecode)
>  (defvar with-time)
> -(defvar org-read-date-inactive)
>  (defun org-read-date-display ()
>    "Display the current date prompt interpretation in the minibuffer."
>    (when org-read-date-display-live
> @@ -17008,6 +17011,8 @@ Some of the options can be changed using the variable
>  	      (error "Unknown conversion type %s for latex fragments"
>  		     processing-type)))))))))
>  
> +(declare-function format-spec "format-spec" (format specification))
> +
>  (defun org-create-math-formula (latex-frag &optional mathml-file)
>    "Convert LATEX-FRAG to MathML and store it in MATHML-FILE.
>  Use `org-latex-to-mathml-convert-command'.  If the conversion is

-- 
Eric Schulte
http://cs.unm.edu/~eschulte/

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Fixed compiler warnings including one small bug in ob-lilypond
  2012-03-16 14:36 ` [PATCH] Fixed compiler warnings including one small bug " Ilya Shlyakhter
  2012-03-16 14:48   ` Eric Schulte
@ 2012-03-16 18:46   ` Achim Gratz
  2012-03-20 12:16     ` Bastien
  1 sibling, 1 reply; 5+ messages in thread
From: Achim Gratz @ 2012-03-16 18:46 UTC (permalink / raw)
  To: emacs-orgmode

Ilya Shlyakhter <ilya_shl@alum.mit.edu> writes:

> +(require 'format-spec)
[...]
> +(declare-function format-spec "format-spec" (format specification))

Only one of these two lines should be necessary?


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Wavetables for the Terratec KOMPLEXER:
http://Synth.Stromeko.net/Downloads.html#KomplexerWaves

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Fixed compiler warnings including one small bug in ob-lilypond
  2012-03-16 18:46   ` Achim Gratz
@ 2012-03-20 12:16     ` Bastien
  0 siblings, 0 replies; 5+ messages in thread
From: Bastien @ 2012-03-20 12:16 UTC (permalink / raw)
  To: Achim Gratz; +Cc: emacs-orgmode

Achim Gratz <Stromeko@nexgo.de> writes:

> Ilya Shlyakhter <ilya_shl@alum.mit.edu> writes:
>
>> +(require 'format-spec)
> [...]
>> +(declare-function format-spec "format-spec" (format specification))
>
> Only one of these two lines should be necessary?

That's right.  I removed the declare-function. 

Thanks,

-- 
 Bastien

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2012-03-20 12:16 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-16  5:55 [PATCH] Fixed compiler warnings including typo in ob-lilypond Ilya Shlyakhter
2012-03-16 14:36 ` [PATCH] Fixed compiler warnings including one small bug " Ilya Shlyakhter
2012-03-16 14:48   ` Eric Schulte
2012-03-16 18:46   ` Achim Gratz
2012-03-20 12:16     ` Bastien

Code repositories for project(s) associated with this inbox:

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).