From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: A Soare Newsgroups: gmane.emacs.devel Subject: Re: Indentation of constants in LISP Date: Thu, 22 Feb 2007 03:53:43 +0100 (CET) Message-ID: <20766042.795211172112823647.JavaMail.www@wwinf4204> Reply-To: alinsoar@voila.fr NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1172112845 12528 80.91.229.12 (22 Feb 2007 02:54:05 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 22 Feb 2007 02:54:05 +0000 (UTC) Cc: "Richard Stallman \[rms\]" To: "Emacs Dev [emacs-devel]" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Feb 22 03:53:59 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1HK45n-0001hM-EI for ged-emacs-devel@m.gmane.org; Thu, 22 Feb 2007 03:53:59 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HK45m-0004ep-OD for ged-emacs-devel@m.gmane.org; Wed, 21 Feb 2007 21:53:58 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HK45c-0004ek-Md for emacs-devel@gnu.org; Wed, 21 Feb 2007 21:53:48 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HK45a-0004eX-7K for emacs-devel@gnu.org; Wed, 21 Feb 2007 21:53:47 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HK45a-0004eU-4O for emacs-devel@gnu.org; Wed, 21 Feb 2007 21:53:46 -0500 Original-Received: from smtp3.voila.fr ([193.252.22.173]) by monty-python.gnu.org with esmtp (Exim 4.52) id 1HK45Y-0005eq-Px; Wed, 21 Feb 2007 21:53:45 -0500 Original-Received: from me-wanadoo.net (localhost [127.0.0.1]) by mwinf4201.voila.fr (SMTP Server) with ESMTP id A884E1C000A2; Thu, 22 Feb 2007 03:53:43 +0100 (CET) Original-Received: from wwinf4204 (wwinf4204 [10.232.2.31]) by mwinf4201.voila.fr (SMTP Server) with ESMTP id A105F1C00092; Thu, 22 Feb 2007 03:53:43 +0100 (CET) X-ME-UUID: 20070222025343659.A105F1C00092@mwinf4201.voila.fr X-Originating-IP: [86.107.96.49] X-Wum-Nature: EMAIL-NATURE X-WUM-FROM: |~| X-WUM-TO: |~| X-WUM-CC: |~| X-WUM-REPLYTO: |~| X-detected-kernel: Linux 2.4-2.6 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:66595 Archived-At: I made a new little modification, because I forgot to cut 3 lines before the old (looking-at ). Please forget about the later patch. Index: emacs/lisp/emacs-lisp/lisp-mode.el =================================================================== RCS file: /sources/emacs/emacs/lisp/emacs-lisp/lisp-mode.el,v retrieving revision 1.199 diff -c -r1.199 lisp-mode.el *** emacs/lisp/emacs-lisp/lisp-mode.el 17 Feb 2007 11:34:22 -0000 1.199 --- emacs/lisp/emacs-lisp/lisp-mode.el 22 Feb 2007 02:51:26 -0000 *************** *** 908,942 **** (let ((normal-indent (current-column))) (cond ((elt state 3) ;; Inside a string, don't change indentation. ! nil) ! ((save-excursion ! ;; test whether current line begins with a constant ! (goto-char indent-point) ! (skip-chars-forward " \t") ! (looking-at ":")) ! (let ((desired-indent ! (save-excursion ! (goto-char (1+ containing-sexp)) ! (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t) ! (point))) ! (parse-sexp-ignore-comments t)) ! ;; Align a constant symbol under the last constant symbol ! (goto-char calculate-lisp-indent-last-sexp) ! (while (> (point) desired-indent) ! (if (looking-at ":") ! (setq desired-indent (point)) ! (backward-sexp 1)))) ! (current-column)) ((and (integerp lisp-indent-offset) containing-sexp) ;; Indent by constant offset (goto-char containing-sexp) (+ (current-column) lisp-indent-offset)) (desired-indent) - ((and (boundp 'lisp-indent-function) - lisp-indent-function - (not retry)) - (or (funcall lisp-indent-function indent-point state) - normal-indent)) (t normal-indent)))))) --- 908,950 ---- (let ((normal-indent (current-column))) (cond ((elt state 3) ;; Inside a string, don't change indentation. ! nil) ((and (integerp lisp-indent-offset) containing-sexp) ;; Indent by constant offset (goto-char containing-sexp) (+ (current-column) lisp-indent-offset)) + (calculate-lisp-indent-last-sexp + ;; in this case calculate-lisp-indent-last-sexp is not nil. + (or + ;; try to align the parameters of a known function + (and (boundp 'lisp-indent-function) + lisp-indent-function + (not retry) + (funcall lisp-indent-function indent-point state)) + ;; if not a standard function, try to align a constant-symbol + ;; under the last preceding constant symbol, if there is such one + ;; of the last 2 preceding symbols, in the previous uncommented + ;; line + (and (save-excursion + (goto-char indent-point) + (skip-chars-forward " \t") + (looking-at ":")) + (let ((parse-sexp-ignore-comments t) + indent) + (goto-char calculate-lisp-indent-last-sexp) + (or (and (looking-at ":") + (setq indent (current-column))) + (and (> calculate-lisp-indent-last-sexp containing-sexp) + (< (save-excursion (beginning-of-line) (point)) + (prog2 (backward-sexp) (point))) + (looking-at ":") + (setq indent (current-column)))) + indent)) + ;; another symbols or constants not preceded by a constant + ;; as defined above. + normal-indent)) + ;; in this case calculate-lisp-indent-last-sexp is nil (desired-indent) (t normal-indent))))))