bug#10968: 24.0.94; loop indentation with `C-M-q' broken

bug#10968: 24.0.94; loop indentation with `C-M-q' broken

[Thierry Volpiatto]

Hi,
It seem indenting a CL loop with `C-M-q' (indent-pp-sexp)
doesn't work anymore unless the loop close is <= two lines.


In GNU Emacs 24.0.94.1 (i686-pc-linux-gnu, X toolkit, Xaw3d scroll bars)
 of 2012-03-05 on thierry-MM061
Windowing system distributor `The X.Org Foundation', version 11.0.11004000
Configured using:
 `configure '--with-x-toolkit=lucid' '--without-rsvg' '--without-gconf'
 '--with-wide-int''

Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: fr_FR.UTF-8
  value of $XMODIFIERS: nil
  locale-coding-system: utf-8-unix
  default enable-multibyte-characters: t

Major mode: Emacs-Lisp

Minor modes in effect:
  display-battery-mode: t
  global-undo-tree-mode: t
  undo-tree-mode: t
  auto-image-file-mode: t
  show-paren-mode: t
  display-time-mode: t
  savehist-mode: t
  minibuffer-depth-indicate-mode: t
  eldoc-mode: t
  diff-auto-refine-mode: t
  anything-completion-mode: t
  anything-dired-mode: Enable anything completion in Dired functions.
Bindings affected are C, R, S, H.
This is deprecated for Emacs24+ users, use `ac-mode' instead.
  shell-dirtrack-mode: t
  tooltip-mode: t
  mouse-wheel-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  column-number-mode: t
  line-number-mode: t
  transient-mark-mode: t

Recent input:
<up> <up> <up> C-SPC C-n C-n C-n C-M-! <up> C-z p <C-M-right> 
<C-M-left> <C-M-right> <up> <up> <up> <tab> <down> 
<tab> <down> <tab> <down> <tab> <up> <up> <up> <up> 
<left> <left> <left> <left> <left> <backspace> <backspace> 
<backspace> <backspace> <left> <left> <left> <left> 
<left> <left> <left> <left> <left> <left> <left> <left> 
<left> <left> ( s e t q SPC l i s t <left> <left> <left> 
<left> <left> <backspace> <right> <right> <right> <right> 
<right> <return> C-M-q <down> <down> <tab> <down> <tab> 
<down> <tab> <up> <up> <left> <backspace> i n d e x 
<down> <down> ) C-j <up> <return> <return> <up> ( s 
e t q SPC A SPC ' ( 3 SPC 4 SPC 5 SPC 6 SPC 7 SPC _ 
<backspace> 8 ) ) C-x C-e <down> <left> <left> <left> 
<left> <left> <left> <left> <left> <left> <left> <left> 
<left> <left> <left> <left> <left> <left> <left> <left> 
( <right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> SPC 2 SPC A 
) C-j q <up> <up> <up> <up> <up> <up> <up> <up> <up> 
<right> <right> <right> <right> <right> <right> <right> 
C-x C-b <down> <down> <down> <down> <down> <down> <down> 
C-SPC C-SPC <C-tab> C-s s e t <down> <down> <down> 
<down> <down> <down> <down> <down> <down> <down> <down> 
<right> C-g C-z p <down> C-a C-SPC C-n C-n M-; <up> 
<up> <up> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <backspace> 
<right> <right> C-x C-s C-x C-s C-x C-f M-B <switch-frame> 
<down> <down> <down> <down> <down> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> C-SPC C-e C-f C-f C-f C-f C-f C-f C-f C-f C-f 
C-f C-f M-w q M-x r e p <return>

Recent messages:

Mark set
Saving file /home/thierry/labo/ioccur-qp/ioccur.el...
Wrote /home/thierry/labo/ioccur-qp/ioccur.el
(No changes need to be saved)

Compiling /home/thierry/labo/ioccur-qp/ioccur.el...done
Wrote /home/thierry/labo/ioccur-qp/ioccur.elc
Mark set


Load-path shadows:
~/elisp/org-active/contrib/lisp/org-eshell hides /usr/local/share/emacs/24.0.94/lisp/org/org-eshell
~/elisp/org-active/contrib/lisp/org-odt hides /usr/local/share/emacs/24.0.94/lisp/org/org-odt
~/elisp/org-active/contrib/lisp/org-lparse hides /usr/local/share/emacs/24.0.94/lisp/org/org-lparse
~/elisp/emms/lisp/tq hides /usr/local/share/emacs/24.0.94/lisp/emacs-lisp/tq

Features:
(shadow gnus-dired nnir mail-extr gnus-msg emacsbug sendmail wdired
find-func debug time-stamp newcomment animate vc-rcs xhg-dvc bzr-core
xdarcs-core xgit-core xmtn-minimal naquadah-theme em-unix em-script
em-prompt em-ls em-hist em-pred em-glob em-dirs em-cmpl em-basic esh-opt
em-banner em-alias esh-var esh-io esh-cmd esh-ext esh-proc esh-groups
eshell esh-module esh-mode align-let server battery undo-tree
slime-xref-browser slime-banner slime-tramp slime-asdf slime-fancy
slime-fontifying-fu slime-package-fu slime-references slime-scratch
slime-presentations slime-fuzzy slime-fancy-inspector slime-c-p-c
slime-editing-commands slime-autodoc slime-parse slime-repl image-file
newsticker newst-treeview tree-widget newst-plainview newst-reader
newst-ticker newst-backend xdvi-search preview-latex pcomplete-extension
em-term term ehelp electric pdbtrack whitespace paren time mime-w3m mime
eword-decode mel path-util mime-parse std11 luna mime-def mcharset
mcs-20 mcs-e20 pces pces-e20 pces-20 broken pcustom poe w3m-load avoid
help-mode view savehist gnus-async nntp markdown-mode org-google-weather
google-weather url-cache googlecl google-maps google-maps-static
google-maps-geocode google-maps-base json simple-call-tree
el-expectations el-mock csv2org iedit rect zop-to-char mule-util alist
pym static apel-ver product elscreen smallurl mm-url rectangle-utils
tv-utils pcvs pcvs-parse pcvs-info pcvs-defs pcvs-util autodoc mb-depth
ioccur cl-info slime hyperspec slime-autoloads ledger-config ledger
esh-arg esh-util tex-site auto-loads esh-toggle flymake eldoc-eval eldoc
no-word regex-tool dired-extension image-dired emms-mpd-config
emms-playlist-limit emms-volume emms-volume-amixer emms-i18n
emms-history emms-score emms-stream-info emms-metaplaylist-mode
emms-bookmarks emms-lastfm-client emms-lastfm-scrobbler parse-time
emms-cue emms-mode-line-icon emms-browser sort emms-playlist-sort
emms-last-played emms-player-xine emms-player-mpd tq emms-playing-time
emms-lyrics emms-url hl-line emms-tag-editor emms-mark emms-mode-line
emms-cache emms-info-ogginfo emms-info-mp3info emms-playlist-mode
emms-player-vlc emms-player-mplayer emms-info emms-streams later-do
emms-source-playlist emms-source-file emms-player-simple emms-setup emms
emms-compat dvc-init bzr-gnus tla-gnus xgit-gnus xhg-gnus gnus-art mm-uu
mml2015 mm-view mml-smime smime dig gnus-sum nnoo gnus-group gnus-undo
nnmail mail-source gnus-start gnus-spec gnus-int gnus-range gnus-win
gnus gnus-ems nnheader dvc-gnus tla-core tla-autoconf tla-defs dvc-log
vc vc-dispatcher add-log ediff-merg ediff-diff ediff-wind ediff-help
ediff-util ediff-mult ediff-init ediff dvc-autoloads htmlize-hack
htmlize muse-colors muse-docbook muse-texinfo texnfo-upd texinfo
muse-latex muse-html muse-xml-common muse-wiki cus-edit cus-start
cus-load muse-publish muse-project muse-protocols muse-regexps muse
muse-nested-tags muse-mode muse-autoloads org-config-thierry ob-sh
org-crypt cal-china lunar solar cal-dst cal-bahai cal-islam cal-hebrew
holidays hol-loaddefs vc-hg org-wl org-w3m org-vm org-rmail org-mhe
org-mew org-irc org-jsinfo org-infojs org-html org-exp ob-exp
org-exp-blocks org-info org-gnus org-docview org-bibtex bibtex org-bbdb
org-agenda appt diary-lib diary-loaddefs org-annotation-helper
org-capture org-mks remember org-remember org-datetree config-w3m w3m
doc-view jka-compr image-mode timezone w3m-hist w3m-fb w3m-ems wid-edit
w3m-ccl ccl w3m-favicon w3m-image w3m-proc w3m-util addressbook-bookmark
message rfc822 mml mml-sec mm-decode mm-bodies mm-encode mail-parse
rfc2231 rfc2047 rfc2045 ietf-drums mailabbrev mail-utils gmm-utils
mailheader firefox-protocol bookmark-uzbl-handler
bookmark-firefox-handler bookmark-extensions org ob-emacs-lisp ob-tangle
ob-ref ob-lob ob-table org-footnote org-src ob-comint ob-keys ob ob-eval
org-pcomplete org-list org-faces org-compat org-entities org-macs
noutline outline cal-menu calendar cal-loaddefs bookmark pp
init-anything-thierry anything-describe-keybindings anything-ipython
edmacro kmacro ipython python-mode info-look executable
anything-delicious anything-mercurial xhg xhg-annotate xhg-mq xhg-log
xhg-core dvc-diff uniquify dvc-fileinfo dvc-unified dvc-tips diff-mode
dvc-core dvc-lisp dvc-buffers dvc-ui dvc-register dvc-utils dvc-emacs
ewoc dvc-defs dvc-site anything-config browse-url rx
anything-match-plugin xml url url-proxy url-privacy url-expand
url-methods url-history url-cookie url-util url-parse url-vars mailcap
grep compile tramp tramp-compat shell pcomplete comint ansi-color ring
format-spec tramp-loaddefs dired-x dired-aux dired regexp-opt ffap
thingatpt anything warnings epa-file epa derived epg epg-config
auth-source eieio byte-opt bytecomp byte-compile cconv macroexp assoc
gnus-util time-date mm-util mail-prsvr password-cache usage-memo
eev-thierry iterator eev-all eev-mini-steps eev-browse-url eev-langs
eev-compose eev-glyphs disp-table eev-insert eev-steps eev-bounded eev
easy-mmode advice help-fns advice-preload cl w3m-wget info easymenu
tooltip ediff-hook vc-hooks lisp-float-type mwheel x-win x-dnd tool-bar
dnd fontset image fringe lisp-mode register page menu-bar rfn-eshadow
timer select scroll-bar mouse jit-lock font-lock syntax facemenu
font-core frame cham georgian utf-8-lang misc-lang vietnamese tibetan
thai tai-viet lao korean japanese hebrew greek romanian slovak czech
european ethiopic indian cyrillic chinese case-table epa-hook
jka-cmpr-hook help simple abbrev minibuffer loaddefs button faces
cus-face files text-properties overlay sha1 md5 base64 format env
code-pages mule custom widget hashtable-print-readable backquote
make-network-process dbusbind dynamic-setting system-font-setting
font-render-setting x-toolkit x multi-tty emacs)

-- 
  Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997 

bug#10968: 24.0.94; loop indentation with `C-M-q' broken

[Glenn Morris]

Thierry Volpiatto wrote:

> It seem indenting a CL loop with `C-M-q' (indent-pp-sexp)
> doesn't work anymore unless the loop close is <= two lines.

Please give an example.

> In GNU Emacs 24.0.94.1 (i686-pc-linux-gnu, X toolkit, Xaw3d scroll bars)
>  of 2012-03-05 on thierry-MM061

bug#10968: 24.0.94; loop indentation with `C-M-q' broken

[Thierry Volpiatto]

Glenn Morris <rgm@gnu.org> writes:

> Thierry Volpiatto wrote:
>
>> It seem indenting a CL loop with `C-M-q' (indent-pp-sexp)
>> doesn't work anymore unless the loop close is <= two lines.
>
> Please give an example.
(require 'cl)
(setq lisp-indent-function 'common-lisp-indent-function)

Use C-M-q on following sexp:

--8<---------------cut here---------------start------------->8---
(loop with cont = (make-hash-table :test test)
      for elm in seq
unless (gethash elm cont)
do (puthash elm elm cont)
finally return
(loop for i being the hash-values in cont collect i))
--8<---------------cut here---------------end--------------->8---

-- 
  Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997 

bug#10968: 24.0.94; loop indentation with `C-M-q' broken

[npostavs]

retitle 10968 common-lisp-indent-function, `C-M-q' on multiline `loop' broken
found 10968 25.2
tags 10968 fixed
close 10968 26.1
quit

Thierry Volpiatto <thierry.volpiatto@gmail.com> writes:

> Glenn Morris <rgm@gnu.org> writes:
>
>> Thierry Volpiatto wrote:
>>
>>> It seem indenting a CL loop with `C-M-q' (indent-pp-sexp)
>>> doesn't work anymore unless the loop close is <= two lines.
>>
>> Please give an example.
> (require 'cl)
> (setq lisp-indent-function 'common-lisp-indent-function)
>
> Use C-M-q on following sexp:
>
> (loop with cont = (make-hash-table :test test)
>       for elm in seq
> unless (gethash elm cont)
> do (puthash elm elm cont)
> finally return
> (loop for i being the hash-values in cont collect i))

With current master I get

(loop with cont = (make-hash-table :test test)
   for elm in seq
   unless (gethash elm cont)
   do (puthash elm elm cont)
   finally return
     (loop for i being the hash-values in cont collect i))

I believe this is correct.