[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 187fe43: * lisp/emacs-lisp/package.elm lisp/emacs-lisp/smie.el: F

From: Stefan Monnier
Subject: master 187fe43: * lisp/emacs-lisp/package.elm lisp/emacs-lisp/smie.el: Fix indent
Date: Fri, 29 May 2020 15:02:04 -0400 (EDT)

branch: master
commit 187fe4310834af72ecfcc5068af464c2e5f14b9a
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    * lisp/emacs-lisp/package.elm lisp/emacs-lisp/smie.el: Fix indent
    Use the new "space after paren" convention to get the desired indentation
 lisp/emacs-lisp/package.el | 10 +++++-----
 lisp/emacs-lisp/smie.el    | 14 +++++++++++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 9a6d1d7..6298244 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -690,9 +690,9 @@ updates `package-alist'."
       (progn (package-load-all-descriptors)
-(defun define-package (_name-string _version-string
-                                    &optional _docstring _requirements
-                                    &rest _extra-properties)
+(defun define-package ( _name-string _version-string
+                        &optional _docstring _requirements
+                        &rest _extra-properties)
   "Define a new package.
 NAME-STRING is the name of the package, as a string.
 VERSION-STRING is the version of the package, as a string.
@@ -1219,8 +1219,8 @@ The return result is a `package-desc'."
-(declare-function epg-verify-string "epg" (context signature
-                                                   &optional signed-text))
+(declare-function epg-verify-string "epg" ( context signature
+                                            &optional signed-text))
 (declare-function epg-context-result-for "epg" (context name))
 (declare-function epg-signature-status "epg" (signature) t)
 (declare-function epg-signature-to-string "epg" (signature))
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index 60d8fa5..38a7b8b 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -52,6 +52,13 @@
 ;;   error because the parser just automatically does something.  Better yet,
 ;;   we can afford to use a sloppy grammar.
+;; The benefits of this approach were presented in the following article,
+;; which includes a kind of tutorial to get started with SMIE:
+;;     SMIE: Weakness is Power!  Auto-indentation with incomplete information
+;;     Stefan Monnier, <Programming> Journal 2020, volumn 5, issue 1.
+;;     doi: 10.22152/programming-journal.org/2020/5/1
 ;; A good background to understand the development (especially the parts
 ;; building the 2D precedence tables and then computing the precedence levels
 ;; from it) can be found in pages 187-194 of "Parsing techniques" by Dick Grune
@@ -63,6 +70,7 @@
 ;; Since then, some of that code has been beaten into submission, but the
 ;; smie-indent-keyword is still pretty obscure.
 ;; Conflict resolution:
 ;; - One source of conflicts is when you have:
@@ -1356,9 +1364,9 @@ Only meaningful when called from within 
           (funcall smie-rules-function :elem 'basic))
-(defun smie-indent--rule (method token
-                          ;; FIXME: Too many parameters.
-                          &optional after parent base-pos)
+(defun smie-indent--rule ( method token
+                           ;; FIXME: Too many parameters.
+                           &optional after parent base-pos)
   "Compute indentation column according to `smie-rules-function'.
 METHOD and TOKEN are passed to `smie-rules-function'.
 AFTER is the position after TOKEN, if known.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]