Commit 0adf5618 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

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.
parent d72700e5
2011-03-15 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/ruby-mode.el (ruby-backward-sexp):
* progmodes/ebrowse.el (ebrowse-draw-file-member-info):
* play/gamegrid.el (gamegrid-make-face):
* play/bubbles.el (bubbles--grid-width, bubbles--grid-height)
(bubbles--colors, bubbles--shift-mode, bubbles--initialize-images):
* notifications.el (notifications-notify):
* net/xesam.el (xesam-search-engines):
* net/quickurl.el (quickurl-list-insert):
* vc/vc-hg.el (vc-hg-dir-printer): Fix use of case.
2011-03-15 Chong Yidong <cyd@stupidchicken.com>
* startup.el (command-line): Update package subdirectory regexp.
......
2011-03-15 Stefan Monnier <monnier@iro.umontreal.ca>
* auth-source.el (auth-source-netrc-create):
* message.el (message-yank-original): Fix use of `case'.
2011-03-15 Teodor Zlatanov <tzz@lifelogs.com>
* message.el (message-yank-original): Use cond instead of CL case.
......
......@@ -1130,10 +1130,10 @@ See `auth-source-search' for details on SPEC."
(if (zerop (length add)) "" " ")
;; remap auth-source tokens to netrc
(case r
('user "login")
('host "machine")
('secret "password")
('port "port") ; redundant but clearer
(user "login")
(host "machine")
(secret "password")
(port "port") ; redundant but clearer
(t (symbol-name r)))
;; the value will be printed in %S format
data))))
......
......@@ -3748,13 +3748,13 @@ prefix, and don't delete any headers."
(goto-char (mark t))
(insert-before-markers ?\n)
(goto-char pt))))
(cond
((eq 'above message-cite-reply-position)
(case message-cite-reply-position
(above
(message-goto-body)
(insert body-text)
(insert (if (bolp) "\n" "\n\n"))
(message-goto-body))
((eq 'below message-cite-reply-position)
(below
(message-goto-signature)))
;; Add a `message-setup-very-last-hook' here?
;; Add `gnus-article-highlight-citation' here?
......
......@@ -511,15 +511,15 @@ TYPE dictates what will be inserted, options are:
(with-current-buffer quickurl-list-last-buffer
(insert
(case type
('url (funcall quickurl-format-function url))
('naked-url (quickurl-url-url url))
('with-lookup (format "%s <URL:%s>"
(url (funcall quickurl-format-function url))
(naked-url (quickurl-url-url url))
(with-lookup (format "%s <URL:%s>"
(quickurl-url-keyword url)
(quickurl-url-url url)))
('with-desc (format "%S <URL:%s>"
(with-desc (format "%S <URL:%s>"
(quickurl-url-description url)
(quickurl-url-url url)))
('lookup (quickurl-url-keyword url)))))
(lookup (quickurl-url-keyword url)))))
(error "No URL details on that line"))
url))
......
......@@ -414,18 +414,18 @@ If there is no registered search engine at all, the function returns `nil'."
;; Hopefully, this will change later.
(setq hit-fields
(case (intern vendor-id)
('Beagle
(Beagle
'("xesam:mimeType" "xesam:url"))
('Strigi
(Strigi
'("xesam:author" "xesam:cc" "xesam:charset"
"xesam:contentType" "xesam:fileExtension"
"xesam:id" "xesam:lineCount" "xesam:links"
"xesam:mimeType" "xesam:name" "xesam:size"
"xesam:sourceModified" "xesam:subject" "xesam:to"
"xesam:url"))
('TrackerXesamSession
(TrackerXesamSession
'("xesam:relevancyRating" "xesam:url"))
('Debbugs
(Debbugs
'("xesam:keyword" "xesam:owner" "xesam:title"
"xesam:url" "xesam:sourceModified" "xesam:mimeType"
"debbugs:key"))
......
......@@ -210,8 +210,8 @@ used to manipulate the notification item with
(add-to-list 'hints `(:dict-entry
"urgency"
(:variant :byte ,(case urgency
('low 0)
('critical 2)
(low 0)
(critical 2)
(t 1)))) t))
(when category
(add-to-list 'hints `(:dict-entry
......
2011-03-15 Stefan Monnier <monnier@iro.umontreal.ca>
* org-src.el (org-src-switch-to-buffer):
* org-plot.el (org-plot/gnuplot-script, org-plot/gnuplot):
* org-mouse.el (org-mouse-agenda-type):
* org-freemind.el (org-freemind-node-to-org):
* ob-sql.el (org-babel-execute:sql):
* ob-exp.el (org-babel-exp-do-export, org-babel-exp-code):
* ob-ref.el (org-babel-ref-resolve): Fix use of case.
2011-03-06 Juanma Barranquero <lekktu@gmail.com>
* org.el (org-blank-before-new-entry, org-context-in-file-links)
......
......@@ -231,10 +231,10 @@ The function respects the value of the :exports header argument."
(org-babel-exp-results info type 'silent))))
(clean () (org-babel-remove-result info)))
(case (intern (or (cdr (assoc :exports (nth 2 info))) "code"))
('none (silently) (clean) "")
('code (silently) (clean) (org-babel-exp-code info type))
('results (org-babel-exp-results info type))
('both (concat (org-babel-exp-code info type)
(none (silently) (clean) "")
(code (silently) (clean) (org-babel-exp-code info type))
(results (org-babel-exp-results info type))
(both (concat (org-babel-exp-code info type)
"\n\n"
(org-babel-exp-results info type))))))
......@@ -250,8 +250,8 @@ The code block is not evaluated."
(name (nth 4 info))
(args (mapcar #'cdr (org-babel-get-header (nth 2 info) :var))))
(case type
('inline (format "=%s=" body))
('block
(inline (format "=%s=" body))
(block
(let ((str
(format "#+BEGIN_SRC %s %s\n%s%s#+END_SRC\n" lang switches body
(if (and body (string-match "\n$" body))
......@@ -265,7 +265,7 @@ The code block is not evaluated."
(mapconcat #'identity args ", ")))
str))
str))
('lob
(lob
(let ((call-line (and (string-match "results=" (car args))
(substring (car args) (match-end 0)))))
(cond
......
......@@ -147,12 +147,12 @@ the variable."
(let ((params (append args '((:results . "silent")))))
(setq result
(case type
('results-line (org-babel-read-result))
('table (org-babel-read-table))
('list (org-babel-read-list))
('file (org-babel-read-link))
('source-block (org-babel-execute-src-block nil nil params))
('lob (org-babel-execute-src-block nil lob-info params)))))
(results-line (org-babel-read-result))
(table (org-babel-read-table))
(list (org-babel-read-list))
(file (org-babel-read-link))
(source-block (org-babel-execute-src-block nil nil params))
(lob (org-babel-execute-src-block nil lob-info params)))))
(if (symbolp result)
(format "%S" result)
(if (and index (listp result))
......
......@@ -66,18 +66,18 @@ This function is called by `org-babel-execute-src-block'."
(out-file (or (cdr (assoc :out-file params))
(org-babel-temp-file "sql-out-")))
(command (case (intern engine)
('msosql (format "osql %s -s \"\t\" -i %s -o %s"
(or cmdline "")
(org-babel-process-file-name in-file)
(org-babel-process-file-name out-file)))
('mysql (format "mysql %s -e \"source %s\" > %s"
(msosql (format "osql %s -s \"\t\" -i %s -o %s"
(or cmdline "")
(org-babel-process-file-name in-file)
(org-babel-process-file-name out-file)))
('postgresql (format "psql -A -P footer=off -F \"\t\" -f %s -o %s %s"
(org-babel-process-file-name in-file)
(org-babel-process-file-name out-file)
(or cmdline "")))
(org-babel-process-file-name in-file)
(org-babel-process-file-name out-file)))
(mysql (format "mysql %s -e \"source %s\" > %s"
(or cmdline "")
(org-babel-process-file-name in-file)
(org-babel-process-file-name out-file)))
(postgresql (format "psql -A -P footer=off -F \"\t\" -f %s -o %s %s"
(org-babel-process-file-name in-file)
(org-babel-process-file-name out-file)
(or cmdline "")))
(t (error "no support for the %s sql engine" engine)))))
(with-temp-file in-file
(insert (org-babel-expand-body:sql body params)))
......
......@@ -1172,8 +1172,8 @@ PATH should be a list of steps, where each step has the form
(when (< 0 (- level skip-levels))
(dolist (attrib attributes)
(case (car attrib)
('TEXT (setq text (cdr attrib)))
('text (setq text (cdr attrib)))))
(TEXT (setq text (cdr attrib)))
(text (setq text (cdr attrib)))))
(unless text
;; There should be a richcontent node holding the text:
(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
(setq text (replace-regexp-in-string "\n $" "" text))
(insert text))
(case qname
('node
(node
(insert (make-string (- level skip-levels) ?*) " " text "\n")
(when note
(insert ":COMMENT:\n" note "\n:END:\n"))
......
......@@ -476,11 +476,11 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
(defun org-mouse-agenda-type (type)
(case type
('tags "Tags: ")
('todo "TODO: ")
('tags-tree "Tags tree: ")
('todo-tree "TODO tree: ")
('occur-tree "Occur tree: ")
(tags "Tags: ")
(todo "TODO: ")
(tags-tree "Tags tree: ")
(todo-tree "TODO tree: ")
(occur-tree "Occur tree: ")
(t "Agenda command ???")))
......
......@@ -206,18 +206,18 @@ manner suitable for prepending to a user-specified script."
(y-labels (plist-get params :ylabels))
(plot-str "'%s' using %s%d%s with %s title '%s'")
(plot-cmd (case type
('2d "plot")
('3d "splot")
('grid "splot")))
(2d "plot")
(3d "splot")
(grid "splot")))
(script "reset") plot-lines)
(flet ((add-to-script (line) (setf script (format "%s\n%s" script line))))
(when file ;; output file
(add-to-script (format "set term %s" (file-name-extension file)))
(add-to-script (format "set output '%s'" file)))
(case type ;; type
('2d ())
('3d (if map (add-to-script "set map")))
('grid (if map
(2d ())
(3d (if map (add-to-script "set map")))
(grid (if map
(add-to-script "set pm3d map")
(add-to-script "set pm3d"))))
(when title (add-to-script (format "set title '%s'" title))) ;; title
......@@ -243,7 +243,7 @@ manner suitable for prepending to a user-specified script."
"%Y-%m-%d-%H:%M:%S") "\"")))
(unless preface
(case type ;; plot command
('2d (dotimes (col num-cols)
(2d (dotimes (col num-cols)
(unless (and (equal type '2d)
(or (and ind (equal (+ 1 col) ind))
(and deps (not (member (+ 1 col) deps)))))
......@@ -258,10 +258,10 @@ manner suitable for prepending to a user-specified script."
with
(or (nth col col-labels) (format "%d" (+ 1 col))))
plot-lines)))))
('3d
(3d
(setq plot-lines (list (format "'%s' matrix with %s title ''"
data-file with))))
('grid
(grid
(setq plot-lines (list (format "'%s' with %s title ''"
data-file with)))))
(add-to-script
......@@ -305,9 +305,9 @@ line directly before or after the table."
(setf params (org-plot/collect-options params))))
;; dump table to datafile (very different for grid)
(case (plist-get params :plot-type)
('2d (org-plot/gnuplot-to-data table data-file params))
('3d (org-plot/gnuplot-to-data table data-file params))
('grid (let ((y-labels (org-plot/gnuplot-to-grid-data
(2d (org-plot/gnuplot-to-data table data-file params))
(3d (org-plot/gnuplot-to-data table data-file params))
(grid (let ((y-labels (org-plot/gnuplot-to-grid-data
table data-file params)))
(when y-labels (plist-put params :ylabels y-labels)))))
;; check for timestamp ind column
......
......@@ -335,26 +335,26 @@ buffer."
(defun org-src-switch-to-buffer (buffer context)
(case org-src-window-setup
('current-window
(current-window
(switch-to-buffer buffer))
('other-window
(other-window
(switch-to-buffer-other-window buffer))
('other-frame
(other-frame
(case context
('exit
(exit
(let ((frame (selected-frame)))
(switch-to-buffer-other-frame buffer)
(delete-frame frame)))
('save
(save
(kill-buffer (current-buffer))
(switch-to-buffer buffer))
(t
(switch-to-buffer-other-frame buffer))))
('reorganize-frame
(reorganize-frame
(if (eq context 'edit) (delete-other-windows))
(org-switch-to-buffer-other-window buffer)
(if (eq context 'exit) (delete-other-windows)))
('switch-invisibly
(switch-invisibly
(set-buffer buffer))
(t
(message "Invalid value %s for org-src-window-setup"
......
......@@ -719,57 +719,57 @@ static char * dot3d_xpm[] = {
(defsubst bubbles--grid-width ()
"Return the grid width for the current game theme."
(car (case bubbles-game-theme
('easy
(easy
bubbles--grid-small)
('medium
(medium
bubbles--grid-medium)
('difficult
(difficult
bubbles--grid-large)
('hard
(hard
bubbles--grid-huge)
('user-defined
(user-defined
bubbles-grid-size))))
(defsubst bubbles--grid-height ()
"Return the grid height for the current game theme."
(cdr (case bubbles-game-theme
('easy
(easy
bubbles--grid-small)
('medium
(medium
bubbles--grid-medium)
('difficult
(difficult
bubbles--grid-large)
('hard
(hard
bubbles--grid-huge)
('user-defined
(user-defined
bubbles-grid-size))))
(defsubst bubbles--colors ()
"Return the color list for the current game theme."
(case bubbles-game-theme
('easy
(easy
bubbles--colors-2)
('medium
(medium
bubbles--colors-3)
('difficult
(difficult
bubbles--colors-4)
('hard
(hard
bubbles--colors-5)
('user-defined
(user-defined
bubbles-colors)))
(defsubst bubbles--shift-mode ()
"Return the shift mode for the current game theme."
(case bubbles-game-theme
('easy
(easy
'default)
('medium
(medium
'default)
('difficult
(difficult
'always)
('hard
(hard
'always)
('user-defined
(user-defined
bubbles-shift-mode)))
(defun bubbles-save-settings ()
......@@ -1346,11 +1346,11 @@ Return t if new char is non-empty."
(when (and (display-images-p)
(not (eq bubbles-graphics-theme 'ascii)))
(let ((template (case bubbles-graphics-theme
('circles bubbles--image-template-circle)
('balls bubbles--image-template-ball)
('squares bubbles--image-template-square)
('diamonds bubbles--image-template-diamond)
('emacs bubbles--image-template-emacs))))
(circles bubbles--image-template-circle)
(balls bubbles--image-template-ball)
(squares bubbles--image-template-square)
(diamonds bubbles--image-template-diamond)
(emacs bubbles--image-template-emacs))))
(setq bubbles--empty-image
(create-image (replace-regexp-in-string
"^\"\\(.*\\)\t.*c .*\",$"
......
......@@ -213,19 +213,19 @@ static unsigned char gamegrid_bits[] = {
(let ((data (gamegrid-match-spec-list data-spec-list))
(color (gamegrid-match-spec-list color-spec-list)))
(case data
('color-x
(color-x
(gamegrid-make-color-x-face color))
('grid-x
(grid-x
(unless gamegrid-grid-x-face
(setq gamegrid-grid-x-face (gamegrid-make-grid-x-face)))
gamegrid-grid-x-face)
('mono-x
(mono-x
(unless gamegrid-mono-x-face
(setq gamegrid-mono-x-face (gamegrid-make-mono-x-face)))
gamegrid-mono-x-face)
('color-tty
(color-tty
(gamegrid-make-color-tty-face color))
('mono-tty
(mono-tty
(unless gamegrid-mono-tty-face
(setq gamegrid-mono-tty-face (gamegrid-make-mono-tty-face)))
gamegrid-mono-tty-face))))
......
......@@ -3566,12 +3566,12 @@ KIND is an additional string printed in the buffer."
(insert kind)
(indent-to 50)
(insert (case (second info)
('ebrowse-ts-member-functions "member function")
('ebrowse-ts-member-variables "member variable")
('ebrowse-ts-static-functions "static function")
('ebrowse-ts-static-variables "static variable")
('ebrowse-ts-friends (if globals-p "define" "friend"))
('ebrowse-ts-types "type")
(ebrowse-ts-member-functions "member function")
(ebrowse-ts-member-variables "member variable")
(ebrowse-ts-static-functions "static function")
(ebrowse-ts-static-variables "static variable")
(ebrowse-ts-friends (if globals-p "define" "friend"))
(ebrowse-ts-types "type")
(t "unknown"))
"\n")))
......
......@@ -974,7 +974,7 @@ With ARG, do it many times. Negative ARG means move forward."
(goto-char (scan-sexps (1+ (point)) -1))
(case (char-before)
(?% (forward-char -1))
('(?q ?Q ?w ?W ?r ?x)
((?q ?Q ?w ?W ?r ?x)
(if (eq (char-before (1- (point))) ?%) (forward-char -2))))
nil)
((looking-at "\\s\"\\|\\\\\\S_")
......
......@@ -104,7 +104,7 @@ See `run-hooks'."
;; We pass a filename to create-file-buffer because it is what
;; the function expects, and also what uniquify needs (if active)
(with-current-buffer (create-file-buffer (expand-file-name bname dir))
(cd dir)
(setq default-directory dir)
(vc-setup-buffer (current-buffer))
;; Reset the vc-parent-buffer-name so that it does not appear
;; in the mode-line.
......@@ -1002,7 +1002,7 @@ specific headers."
(generate-new-buffer (format " *VC-%s* tmp status" backend))))
(lexical-let ((buffer (current-buffer)))
(with-current-buffer vc-dir-process-buffer
(cd def-dir)
(setq default-directory def-dir)
(erase-buffer)
(vc-call-backend
backend 'dir-status-files def-dir files default-state
......@@ -1067,7 +1067,7 @@ Throw an error if another update process is in progress."
(ewoc-set-hf vc-ewoc (vc-dir-headers backend def-dir) "")
(lexical-let ((buffer (current-buffer)))
(with-current-buffer vc-dir-process-buffer
(cd def-dir)
(setq default-directory def-dir)
(erase-buffer)
(vc-call-backend
backend 'dir-status def-dir
......
......@@ -529,9 +529,9 @@ REV is the revision to check out into WORKFILE."
(insert (propertize
(format " (%s %s)"
(case (vc-hg-extra-fileinfo->rename-state extra)
('copied "copied from")
('renamed-from "renamed from")
('renamed-to "renamed to"))
(copied "copied from")
(renamed-from "renamed from")
(renamed-to "renamed to"))
(vc-hg-extra-fileinfo->extra-name extra))
'face 'font-lock-comment-face)))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment