diff options
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/edebug.el | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/subr-x.el | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 381b7964a35..deebe5109bd 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -4577,10 +4577,9 @@ With prefix argument, make it a temporary breakpoint." (add-hook 'called-interactively-p-functions #'edebug--called-interactively-skip) (defun edebug--called-interactively-skip (i frame1 frame2) - (when (and (memq (car-safe (nth 1 frame1)) '(lambda closure)) + (when (and (interpreted-function-p (nth 1 frame1)) ;; Lambda value with no arguments. - (null (nth (if (eq (car-safe (nth 1 frame1)) 'lambda) 1 2) - (nth 1 frame1))) + (null (aref (nth 1 frame1) 0)) (memq (nth 1 frame2) '(edebug-enter edebug-default-enter))) ;; `edebug-enter' calls itself on its first invocation. (let ((s 1)) diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el index 699be767ee7..e62a08b7a8b 100644 --- a/lisp/emacs-lisp/subr-x.el +++ b/lisp/emacs-lisp/subr-x.el @@ -158,6 +158,7 @@ removed." (string-trim (replace-regexp-in-string blank " " string t t) blank blank))) +;;;###autoload (defun string-fill (string length) "Try to word-wrap STRING so that no lines are longer than LENGTH. Wrapping is done where there is whitespace. If there are @@ -172,6 +173,7 @@ result will have lines that are longer than LENGTH." (fill-region (point-min) (point-max))) (buffer-string))) +;;;###autoload (defun string-limit (string length &optional end coding-system) "Return a substring of STRING that is (up to) LENGTH characters long. If STRING is shorter than or equal to LENGTH characters, return the @@ -253,6 +255,7 @@ than this function." (end (substring string (- (length string) length))) (t (substring string 0 length))))) +;;;###autoload (defun string-pad (string length &optional padding start) "Pad STRING to LENGTH using PADDING. If PADDING is nil, the space character is used. If not nil, it @@ -272,6 +275,7 @@ the string." (start (concat (make-string pad-length (or padding ?\s)) string)) (t (concat string (make-string pad-length (or padding ?\s))))))) +;;;###autoload (defun string-chop-newline (string) "Remove the final newline (if any) from STRING." (declare (pure t) (side-effect-free t)) |