zzkt/scel
1
0
Fork 0
Code Issues 7 Pull requests Projects Activity Actions

Merge pull request #9 from widp/flet-macro-change

Browse source 
change instances of flet to cl-flet as flet is obsolete
This commit is contained in:
Brian Heim 2018-08-02 20:46:51 -05:00 committed by GitHub
commit 7ec76e4c02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
el/sclang-help.el
View file

@ -349,7 +349,7 @@
(sclang-help-mode-limit-point-to-code (sclang-end-of-defun arg))) (sclang-help-mode-limit-point-to-code (sclang-end-of-defun arg)))
(defun sclang-help-mode-fontify-region (start end loudly) (defun sclang-help-mode-fontify-region (start end loudly)
(flet ((fontify-code (cl-flet ((fontify-code
(start end loudly) (start end loudly)
(funcall 'font-lock-default-fontify-region start end loudly)) (funcall 'font-lock-default-fontify-region start end loudly))
(fontify-non-code (fontify-non-code
@ -435,7 +435,7 @@
;; (defun sclang-extension-help-directories () ;; (defun sclang-extension-help-directories ()
;; "Build a list of help directories for extensions." ;; "Build a list of help directories for extensions."
;; (flet ((flatten (seq) ;; (cl-flet ((flatten (seq)
;; (if (null seq) ;; (if (null seq)
;; seq ;; seq
;; (if (listp seq) ;; (if (listp seq)

2
el/sclang-interp.el
View file

@ -287,7 +287,7 @@ If EOB-P is non-nil, positions cursor at end of buffer."
(defun sclang-make-options () (defun sclang-make-options ()
(let ((default-directory "") (let ((default-directory "")
(res ())) (res ()))
(flet ((append-option (cl-flet ((append-option
(option &optional value) (option &optional value)
(setq res (append res (list option) (and value (list value)))))) (setq res (append res (list option) (and value (list value))))))
(if (file-directory-p sclang-runtime-directory) (if (file-directory-p sclang-runtime-directory)

4
el/sclang-language.el
View file

@ -252,7 +252,7 @@ low-resource systems."
(defun sclang-read-symbol (prompt &optional default predicate require-match inherit-input-method) (defun sclang-read-symbol (prompt &optional default predicate require-match inherit-input-method)
(if sclang-use-symbol-table (if sclang-use-symbol-table
(flet ((make-minibuffer-local-map (cl-flet ((make-minibuffer-local-map
(parent-keymap) (parent-keymap)
(let ((map (make-sparse-keymap))) (let ((map (make-sparse-keymap)))
(set-keymap-parent map parent-keymap) (set-keymap-parent map parent-keymap)
@ -753,7 +753,7 @@ current-directory, iff `sclang-source-directoy' is nil."
Looks for all repetitive patterns in ITEMS recursively. Therefore, it is Looks for all repetitive patterns in ITEMS recursively. Therefore, it is
computationally expensive, especially when ITEMS is a long list. If you don't computationally expensive, especially when ITEMS is a long list. If you don't
want smart pattern guessing, use `sclang-format' directly to format your Pseq." want smart pattern guessing, use `sclang-format' directly to format your Pseq."
(flet ((find-reps (items) (cl-flet ((find-reps (items)
(let (r) (let (r)
(while items (while items
(let ((ret (car items)) (let ((ret (car items))

2
el/sclang-server.el
View file

@ -120,7 +120,7 @@
(define-key map [?o] 'sclang-server-dump-osc) (define-key map [?o] 'sclang-server-dump-osc)
(define-key map [?p] 'sclang-show-server-panel) (define-key map [?p] 'sclang-show-server-panel)
(define-key map [?q] 'sclang-server-quit) (define-key map [?q] 'sclang-server-quit)
(flet ((fill-record-map (map) (cl-flet ((fill-record-map (map)
(define-key map [?n] 'sclang-server-prepare-for-record) (define-key map [?n] 'sclang-server-prepare-for-record)
(define-key map [?p] 'sclang-server-pause-recording) (define-key map [?p] 'sclang-server-pause-recording)
(define-key map [?r] 'sclang-server-record) (define-key map [?r] 'sclang-server-record)