aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/org
diff options
context:
space:
mode:
authorStefan Monnier2011-03-15 13:39:56 -0400
committerStefan Monnier2011-03-15 13:39:56 -0400
commit0adf561883e07549e657a39d0a4a95cafa4d04fd (patch)
tree6a22754da903e82912e1144668cb98ff44e76783 /lisp/org
parentd72700e549c5006c24f368f6c35db0464593b1f0 (diff)
downloademacs-0adf561883e07549e657a39d0a4a95cafa4d04fd.tar.gz
emacs-0adf561883e07549e657a39d0a4a95cafa4d04fd.zip
Fix misuse of quote in `case'.
* lisp/progmodes/ruby-mode.el (ruby-backward-sexp): * lisp/progmodes/ebrowse.el (ebrowse-draw-file-member-info): * lisp/play/gamegrid.el (gamegrid-make-face): * lisp/play/bubbles.el (bubbles--grid-width, bubbles--grid-height) (bubbles--colors, bubbles--shift-mode, bubbles--initialize-images): * lisp/notifications.el (notifications-notify): * lisp/net/xesam.el (xesam-search-engines): * lisp/net/quickurl.el (quickurl-list-insert): * lisp/vc/vc-hg.el (vc-hg-dir-printer): Fix use of case. * lisp/gnus/auth-source.el (auth-source-netrc-create): * lisp/gnus/message.el (message-yank-original): Fix use of `case'. * lisp/org/org-src.el (org-src-switch-to-buffer): * lisp/org/org-plot.el (org-plot/gnuplot-script, org-plot/gnuplot): * lisp/org/org-mouse.el (org-mouse-agenda-type): * lisp/org/org-freemind.el (org-freemind-node-to-org): * lisp/org/ob-sql.el (org-babel-execute:sql): * lisp/org/ob-exp.el (org-babel-exp-do-export, org-babel-exp-code): * lisp/org/ob-ref.el (org-babel-ref-resolve): Fix use of case.
Diffstat (limited to 'lisp/org')
-rw-r--r--lisp/org/ChangeLog10
-rw-r--r--lisp/org/ob-exp.el14
-rw-r--r--lisp/org/ob-ref.el12
-rw-r--r--lisp/org/ob-sql.el22
-rw-r--r--lisp/org/org-freemind.el6
-rw-r--r--lisp/org/org-mouse.el10
-rw-r--r--lisp/org/org-plot.el24
-rw-r--r--lisp/org/org-src.el14
8 files changed, 61 insertions, 51 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index e75821b6860..44a2cb15b7e 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,13 @@
12011-03-15 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * org-src.el (org-src-switch-to-buffer):
4 * org-plot.el (org-plot/gnuplot-script, org-plot/gnuplot):
5 * org-mouse.el (org-mouse-agenda-type):
6 * org-freemind.el (org-freemind-node-to-org):
7 * ob-sql.el (org-babel-execute:sql):
8 * ob-exp.el (org-babel-exp-do-export, org-babel-exp-code):
9 * ob-ref.el (org-babel-ref-resolve): Fix use of case.
10
12011-03-06 Juanma Barranquero <lekktu@gmail.com> 112011-03-06 Juanma Barranquero <lekktu@gmail.com>
2 12
3 * org.el (org-blank-before-new-entry, org-context-in-file-links) 13 * org.el (org-blank-before-new-entry, org-context-in-file-links)
diff --git a/lisp/org/ob-exp.el b/lisp/org/ob-exp.el
index 1be45198e0d..3215bcf4d8a 100644
--- a/lisp/org/ob-exp.el
+++ b/lisp/org/ob-exp.el
@@ -231,10 +231,10 @@ The function respects the value of the :exports header argument."
231 (org-babel-exp-results info type 'silent)))) 231 (org-babel-exp-results info type 'silent))))
232 (clean () (org-babel-remove-result info))) 232 (clean () (org-babel-remove-result info)))
233 (case (intern (or (cdr (assoc :exports (nth 2 info))) "code")) 233 (case (intern (or (cdr (assoc :exports (nth 2 info))) "code"))
234 ('none (silently) (clean) "") 234 (none (silently) (clean) "")
235 ('code (silently) (clean) (org-babel-exp-code info type)) 235 (code (silently) (clean) (org-babel-exp-code info type))
236 ('results (org-babel-exp-results info type)) 236 (results (org-babel-exp-results info type))
237 ('both (concat (org-babel-exp-code info type) 237 (both (concat (org-babel-exp-code info type)
238 "\n\n" 238 "\n\n"
239 (org-babel-exp-results info type)))))) 239 (org-babel-exp-results info type))))))
240 240
@@ -250,8 +250,8 @@ The code block is not evaluated."
250 (name (nth 4 info)) 250 (name (nth 4 info))
251 (args (mapcar #'cdr (org-babel-get-header (nth 2 info) :var)))) 251 (args (mapcar #'cdr (org-babel-get-header (nth 2 info) :var))))
252 (case type 252 (case type
253 ('inline (format "=%s=" body)) 253 (inline (format "=%s=" body))
254 ('block 254 (block
255 (let ((str 255 (let ((str
256 (format "#+BEGIN_SRC %s %s\n%s%s#+END_SRC\n" lang switches body 256 (format "#+BEGIN_SRC %s %s\n%s%s#+END_SRC\n" lang switches body
257 (if (and body (string-match "\n$" body)) 257 (if (and body (string-match "\n$" body))
@@ -265,7 +265,7 @@ The code block is not evaluated."
265 (mapconcat #'identity args ", "))) 265 (mapconcat #'identity args ", ")))
266 str)) 266 str))
267 str)) 267 str))
268 ('lob 268 (lob
269 (let ((call-line (and (string-match "results=" (car args)) 269 (let ((call-line (and (string-match "results=" (car args))
270 (substring (car args) (match-end 0))))) 270 (substring (car args) (match-end 0)))))
271 (cond 271 (cond
diff --git a/lisp/org/ob-ref.el b/lisp/org/ob-ref.el
index 7b06e90f924..96819df8ea1 100644
--- a/lisp/org/ob-ref.el
+++ b/lisp/org/ob-ref.el
@@ -147,12 +147,12 @@ the variable."
147 (let ((params (append args '((:results . "silent"))))) 147 (let ((params (append args '((:results . "silent")))))
148 (setq result 148 (setq result
149 (case type 149 (case type
150 ('results-line (org-babel-read-result)) 150 (results-line (org-babel-read-result))
151 ('table (org-babel-read-table)) 151 (table (org-babel-read-table))
152 ('list (org-babel-read-list)) 152 (list (org-babel-read-list))
153 ('file (org-babel-read-link)) 153 (file (org-babel-read-link))
154 ('source-block (org-babel-execute-src-block nil nil params)) 154 (source-block (org-babel-execute-src-block nil nil params))
155 ('lob (org-babel-execute-src-block nil lob-info params))))) 155 (lob (org-babel-execute-src-block nil lob-info params)))))
156 (if (symbolp result) 156 (if (symbolp result)
157 (format "%S" result) 157 (format "%S" result)
158 (if (and index (listp result)) 158 (if (and index (listp result))
diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index 3bd10d6b2bd..49859d24a17 100644
--- a/lisp/org/ob-sql.el
+++ b/lisp/org/ob-sql.el
@@ -66,18 +66,18 @@ This function is called by `org-babel-execute-src-block'."
66 (out-file (or (cdr (assoc :out-file params)) 66 (out-file (or (cdr (assoc :out-file params))
67 (org-babel-temp-file "sql-out-"))) 67 (org-babel-temp-file "sql-out-")))
68 (command (case (intern engine) 68 (command (case (intern engine)
69 ('msosql (format "osql %s -s \"\t\" -i %s -o %s" 69 (msosql (format "osql %s -s \"\t\" -i %s -o %s"
70 (or cmdline "")
71 (org-babel-process-file-name in-file)
72 (org-babel-process-file-name out-file)))
73 ('mysql (format "mysql %s -e \"source %s\" > %s"
74 (or cmdline "") 70 (or cmdline "")
75 (org-babel-process-file-name in-file) 71 (org-babel-process-file-name in-file)
76 (org-babel-process-file-name out-file))) 72 (org-babel-process-file-name out-file)))
77 ('postgresql (format "psql -A -P footer=off -F \"\t\" -f %s -o %s %s" 73 (mysql (format "mysql %s -e \"source %s\" > %s"
78 (org-babel-process-file-name in-file) 74 (or cmdline "")
79 (org-babel-process-file-name out-file) 75 (org-babel-process-file-name in-file)
80 (or cmdline ""))) 76 (org-babel-process-file-name out-file)))
77 (postgresql (format "psql -A -P footer=off -F \"\t\" -f %s -o %s %s"
78 (org-babel-process-file-name in-file)
79 (org-babel-process-file-name out-file)
80 (or cmdline "")))
81 (t (error "no support for the %s sql engine" engine))))) 81 (t (error "no support for the %s sql engine" engine)))))
82 (with-temp-file in-file 82 (with-temp-file in-file
83 (insert (org-babel-expand-body:sql body params))) 83 (insert (org-babel-expand-body:sql body params)))
diff --git a/lisp/org/org-freemind.el b/lisp/org/org-freemind.el
index c85b4bac36a..dccdf449296 100644
--- a/lisp/org/org-freemind.el
+++ b/lisp/org/org-freemind.el
@@ -1172,8 +1172,8 @@ PATH should be a list of steps, where each step has the form
1172 (when (< 0 (- level skip-levels)) 1172 (when (< 0 (- level skip-levels))
1173 (dolist (attrib attributes) 1173 (dolist (attrib attributes)
1174 (case (car attrib) 1174 (case (car attrib)
1175 ('TEXT (setq text (cdr attrib))) 1175 (TEXT (setq text (cdr attrib)))
1176 ('text (setq text (cdr attrib))))) 1176 (text (setq text (cdr attrib)))))
1177 (unless text 1177 (unless text
1178 ;; There should be a richcontent node holding the text: 1178 ;; There should be a richcontent node holding the text:
1179 (setq text (org-freemind-get-richcontent-node-text node))) 1179 (setq text (org-freemind-get-richcontent-node-text node)))
@@ -1193,7 +1193,7 @@ PATH should be a list of steps, where each step has the form
1193 (setq text (replace-regexp-in-string "\n $" "" text)) 1193 (setq text (replace-regexp-in-string "\n $" "" text))
1194 (insert text)) 1194 (insert text))
1195 (case qname 1195 (case qname
1196 ('node 1196 (node
1197 (insert (make-string (- level skip-levels) ?*) " " text "\n") 1197 (insert (make-string (- level skip-levels) ?*) " " text "\n")
1198 (when note 1198 (when note
1199 (insert ":COMMENT:\n" note "\n:END:\n")) 1199 (insert ":COMMENT:\n" note "\n:END:\n"))
diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el
index d30f172f42f..cec19d89de1 100644
--- a/lisp/org/org-mouse.el
+++ b/lisp/org/org-mouse.el
@@ -476,11 +476,11 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
476 476
477(defun org-mouse-agenda-type (type) 477(defun org-mouse-agenda-type (type)
478 (case type 478 (case type
479 ('tags "Tags: ") 479 (tags "Tags: ")
480 ('todo "TODO: ") 480 (todo "TODO: ")
481 ('tags-tree "Tags tree: ") 481 (tags-tree "Tags tree: ")
482 ('todo-tree "TODO tree: ") 482 (todo-tree "TODO tree: ")
483 ('occur-tree "Occur tree: ") 483 (occur-tree "Occur tree: ")
484 (t "Agenda command ???"))) 484 (t "Agenda command ???")))
485 485
486 486
diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el
index c5f4bff24fa..10722403f7e 100644
--- a/lisp/org/org-plot.el
+++ b/lisp/org/org-plot.el
@@ -206,18 +206,18 @@ manner suitable for prepending to a user-specified script."
206 (y-labels (plist-get params :ylabels)) 206 (y-labels (plist-get params :ylabels))
207 (plot-str "'%s' using %s%d%s with %s title '%s'") 207 (plot-str "'%s' using %s%d%s with %s title '%s'")
208 (plot-cmd (case type 208 (plot-cmd (case type
209 ('2d "plot") 209 (2d "plot")
210 ('3d "splot") 210 (3d "splot")
211 ('grid "splot"))) 211 (grid "splot")))
212 (script "reset") plot-lines) 212 (script "reset") plot-lines)
213 (flet ((add-to-script (line) (setf script (format "%s\n%s" script line)))) 213 (flet ((add-to-script (line) (setf script (format "%s\n%s" script line))))
214 (when file ;; output file 214 (when file ;; output file
215 (add-to-script (format "set term %s" (file-name-extension file))) 215 (add-to-script (format "set term %s" (file-name-extension file)))
216 (add-to-script (format "set output '%s'" file))) 216 (add-to-script (format "set output '%s'" file)))
217 (case type ;; type 217 (case type ;; type
218 ('2d ()) 218 (2d ())
219 ('3d (if map (add-to-script "set map"))) 219 (3d (if map (add-to-script "set map")))
220 ('grid (if map 220 (grid (if map
221 (add-to-script "set pm3d map") 221 (add-to-script "set pm3d map")
222 (add-to-script "set pm3d")))) 222 (add-to-script "set pm3d"))))
223 (when title (add-to-script (format "set title '%s'" title))) ;; title 223 (when title (add-to-script (format "set title '%s'" title))) ;; title
@@ -243,7 +243,7 @@ manner suitable for prepending to a user-specified script."
243 "%Y-%m-%d-%H:%M:%S") "\""))) 243 "%Y-%m-%d-%H:%M:%S") "\"")))
244 (unless preface 244 (unless preface
245 (case type ;; plot command 245 (case type ;; plot command
246 ('2d (dotimes (col num-cols) 246 (2d (dotimes (col num-cols)
247 (unless (and (equal type '2d) 247 (unless (and (equal type '2d)
248 (or (and ind (equal (+ 1 col) ind)) 248 (or (and ind (equal (+ 1 col) ind))
249 (and deps (not (member (+ 1 col) deps))))) 249 (and deps (not (member (+ 1 col) deps)))))
@@ -258,10 +258,10 @@ manner suitable for prepending to a user-specified script."
258 with 258 with
259 (or (nth col col-labels) (format "%d" (+ 1 col)))) 259 (or (nth col col-labels) (format "%d" (+ 1 col))))
260 plot-lines))))) 260 plot-lines)))))
261 ('3d 261 (3d
262 (setq plot-lines (list (format "'%s' matrix with %s title ''" 262 (setq plot-lines (list (format "'%s' matrix with %s title ''"
263 data-file with)))) 263 data-file with))))
264 ('grid 264 (grid
265 (setq plot-lines (list (format "'%s' with %s title ''" 265 (setq plot-lines (list (format "'%s' with %s title ''"
266 data-file with))))) 266 data-file with)))))
267 (add-to-script 267 (add-to-script
@@ -305,9 +305,9 @@ line directly before or after the table."
305 (setf params (org-plot/collect-options params)))) 305 (setf params (org-plot/collect-options params))))
306 ;; dump table to datafile (very different for grid) 306 ;; dump table to datafile (very different for grid)
307 (case (plist-get params :plot-type) 307 (case (plist-get params :plot-type)
308 ('2d (org-plot/gnuplot-to-data table data-file params)) 308 (2d (org-plot/gnuplot-to-data table data-file params))
309 ('3d (org-plot/gnuplot-to-data table data-file params)) 309 (3d (org-plot/gnuplot-to-data table data-file params))
310 ('grid (let ((y-labels (org-plot/gnuplot-to-grid-data 310 (grid (let ((y-labels (org-plot/gnuplot-to-grid-data
311 table data-file params))) 311 table data-file params)))
312 (when y-labels (plist-put params :ylabels y-labels))))) 312 (when y-labels (plist-put params :ylabels y-labels)))))
313 ;; check for timestamp ind column 313 ;; check for timestamp ind column
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 98fdb75423d..bd1c3802044 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -335,26 +335,26 @@ buffer."
335 335
336(defun org-src-switch-to-buffer (buffer context) 336(defun org-src-switch-to-buffer (buffer context)
337 (case org-src-window-setup 337 (case org-src-window-setup
338 ('current-window 338 (current-window
339 (switch-to-buffer buffer)) 339 (switch-to-buffer buffer))
340 ('other-window 340 (other-window
341 (switch-to-buffer-other-window buffer)) 341 (switch-to-buffer-other-window buffer))
342 ('other-frame 342 (other-frame
343 (case context 343 (case context
344 ('exit 344 (exit
345 (let ((frame (selected-frame))) 345 (let ((frame (selected-frame)))
346 (switch-to-buffer-other-frame buffer) 346 (switch-to-buffer-other-frame buffer)
347 (delete-frame frame))) 347 (delete-frame frame)))
348 ('save 348 (save
349 (kill-buffer (current-buffer)) 349 (kill-buffer (current-buffer))
350 (switch-to-buffer buffer)) 350 (switch-to-buffer buffer))
351 (t 351 (t
352 (switch-to-buffer-other-frame buffer)))) 352 (switch-to-buffer-other-frame buffer))))
353 ('reorganize-frame 353 (reorganize-frame
354 (if (eq context 'edit) (delete-other-windows)) 354 (if (eq context 'edit) (delete-other-windows))
355 (org-switch-to-buffer-other-window buffer) 355 (org-switch-to-buffer-other-window buffer)
356 (if (eq context 'exit) (delete-other-windows))) 356 (if (eq context 'exit) (delete-other-windows)))
357 ('switch-invisibly 357 (switch-invisibly
358 (set-buffer buffer)) 358 (set-buffer buffer))
359 (t 359 (t
360 (message "Invalid value %s for org-src-window-setup" 360 (message "Invalid value %s for org-src-window-setup"