Tramp: Disable paging with PAGER=cat.

Fixes: debbugs:19870
* net/tramp-sh.el (tramp-remote-process-environment): Disable paging
with PAGER=cat.

Fix doc-string of x_frame_normalize_before_maximize.

* xterm.c (x_frame_normalize_before_maximize): Fix doc-string.
Suggested by Alan Mackenzie <acm@muc.de>.

emacs-lisp/package.el (describe-package-1): Describe incompatibility.

Fix assertion violations when popping menus on TTY  (Bug#19862)

 src/menu.c (Fx_popup_menu) [HAVE_X_WINDOWS]: Call
 x_relative_mouse_position only for X frames.

emacs-lisp/package.el: Move the compatibility-table building logic.

* lisp/emacs-lisp/cl*.el: Use define-inline and move some code

* lisp/emacs-lisp/cl-lib.el: Move autoloaded code to cl-preload.

* lisp/emacs-lisp/cl-preloaded.el (cl-struct-define): Register as children
of the parent.
(cl--assertion-failed): New function.
(cl-assertion-failed): Move in from cl-lib.el.

* lisp/emacs-lisp/cl-macs.el (cl-defstruct): Don't generate code to register
as children of its parents.
(cl--make-type-test, cl--compiler-macro-typep): Remove functions.
(cl-typep): Reimplement using define-inline.
(cl-assert): Use cl--assertion-failed.
(cl-struct-slot-value): Use define-inline.

* lisp/textmodes/flyspell.el (flyspell-word): Defvar.

Fixes: debbugs:19844
(flyspell-generic-check-word-p): Mark as obsolete.
* lisp/erc/erc-spelling.el (erc-spelling-init):
Use flyspell-generic-check-word-predicate.

# Add 2015 to copyright years

Fixes: debbugs:19850
* configure.ac: Set locallisppath to empty for NS self contained,
unless --enable-loadllisppath was given.

emacs-lisp/package.el (describe-package-1): Fix "incompat" handling.

emacs-lisp/package.el (package--incompatible-p): Check dependencies.

Move rfc2104 from gnus to net

* net/rfc2104.el: Moved here from lisp/gnus.

Implement SCRAM-SHA-1 SASL mechanism

Fixes: debbugs:17636
* lisp/net/sasl-scram-rfc.el: New file.

* lisp/net/sasl.el (sasl-mechanisms): Remove SCRAM-MD5.  Add
SCRAM-SHA-1 first.
(sasl-mechanism-alist): Remove SCRAM-MD5 entry.  Add SCRAM-SHA-1
entry.

* test/automated/sasl-scram-rfc-tests.el: New file.

lisp/gnus/gnus-msg.el (gnus-msg-mail): Buffer-local warning fix (bug#19573)

lisp/gnus/nnmail.el (nnmail-expiry-target-group): Allow expiring nnimap to a group again

* lisp/net/shr.el (shr-tag-li): Speed up rendering pages with lots of <ul>

Better support for future plugins

See the thread containing:
http://lists.gnu.org/archive/html/emacs-devel/2015-02/msg00720.html
* lib-src/make-docfile.c (write_globals): Generate code that #defines
Qxxx macros other than Qnil only if DEFINE_NONNIL_Q_SYMBOL_MACROS.
Qnil is safe to define even in plugins, since it must be zero for
other reasons.
* src/lisp.h (DEFINE_LISP_SYMBOL): New macro, replacing and simplifying
DEFINE_LISP_SYMBOL_BEGIN / DEFINE_LISP_SYMBOL_END.  All uses changed.
(DEFINE_NONNIL_Q_SYMBOL_MACROS): New macro, defaulting to true.

gdb-mi.el (gdb-display-io-nopopup): New defcustom.

* lisp/progmodes/gdb-mi.el (gdb-inferior-filter): Don't pop up the
buried output buffer when `gdb-display-io-nopopup' is non-nil.

lisp/gnus/gnus-art.el (gnus-article-browse-html-save-cid-content, gnus-article-browse-html-parts): Make cid file names relative if and only if html doesn't specify <base> directory

python.el: Allow killing shell buffer if process is dead.

Fixes: debbugs:19823
* lisp/progmodes/python.el (python-shell-font-lock-kill-buffer): Don't
require a running process.
(python-shell-font-lock-post-command-hook): Fontify only if the
shell process is running.

emacs-lisp/package.el: Indicate incompatible packages.

These are packages which require a higher emacs version than the
current one.

emacs-lisp/package.el (package-install): Invert the second argument.

* lisp/hi-lock.el: Don't call font-lock-remove-keywords if not needed.

Fixes: debbugs:19737
(hi-lock-unface-buffer): Don't call font-lock-remove-keywords if not needed.

Add a backward-compatible version of seq-reverse

* lisp/emacs-lisp/seq.el (seq-reverse): Add a backward-compatible
version of seq-reverse that works on sequences in Emacs 24.  Bump
version to 1.2.
* test/automated/seq-tests.el (test-seq-reverse, test-seq-group-by):
Add a test for seq-reverse and update test for seq-group-by to test
vectors and strings, not only lists.

Improve seq-group-by to return sequence elements in correct order

* lisp/emacs-lisp/seq.el (seq-group-by): Improves seq-group-by to
return sequence elements in correct order
* tests/automated/seq-tests.el: Update test for seq-group-by
* doc/lispref/sequences.texi (Sequence Functions): Update documentation
examples for seq-group-by

Add manual entry for fullscreen-restore parameter.

* frames.texi (Size Parameters): Describe `fullscreen-restore'
parameter.

Improve toggling fullscreen state of frames.

* frame.el (toggle-frame-maximized, toggle-frame-fullscreen):
Rename frame parameter `maximized' to `fullscreen-restore'.
Restore fullwidth/-height after fullboth state.  Update
doc-strings.
* w32term.c (w32_read_socket): In SIZE_MAXIMIZED and
SIZE_RESTORED cases correctly handle `maximized' value for the
`fullscreen' parameter.  Don't use the 'maximized' parameter any
more.
(w32fullscreen_hook): Include menu bar height when calculating
new text height in FULLSCREEN_BOTH case.
* xterm.c (do_ewmh_fullscreen): Handle transition from
FULLSCREEN_BOTH to FULLSCREEN_MAXIMIZED when
x_frame_normalize_before_maximize is set.
* frames.texi (Size Parameters): Update description of
fullscreen frame parameter.

Fix <li><p> indentation in shr

(shr-ensure-paragraph): Don't insert a new paragraph as the first
item in a <li>.

lisp/gnus/gnus-art.el (gnus-treat-buttonize): Don't buttonize URLs in HTML

(shr-fill-line): Preserve background colours when indenting/folding.

shr space widths fixup

* lisp/net/shr.el (shr-insert): Make sure the space inserted has the
right font (for width).

* package-test.el (package-test-signed): More informative failure messages

Not that anyone appears to read them.

lisp/gnus/mm-decode.el: Fix previous commit

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Fix up :align-to background colours

(shr-insert-table): Only copy the background, not underline and
the like.
(shr-face-background): New function.

lisp/gnus/mm-decode.el: Fix previous commit

Use bool for boolean in xdisp.c

* dispextern.h (display_prop_intangible_p, resize_mini_window)
(pixel_to_glyph_coords, mark_window_display_accurate)
(compute_display_string_pos, handle_tool_bar_click)
(x_intersect_rectangles, clear_mouse_face, display_tty_menu_item):
* lisp.h (setup_echo_area_for_printing, message_with_string)
(pos_visible_p): Use bool for boolean.
* xdisp.c: Use bool, true, false intstead of int, 1, 0.
Remove unnecessary forward decls.
(trace_move) [DEBUG_TRACE_MOVE]: Now static.
(CHECK_IT, CHECK_WINDOW_END):
Now an inline function that is always defined.
(check_it) [0]:
(check_window_end) [oGLYPH_DEBUG && ENABLE_CHECKING]:
Remove; no longer needed.
(handle_stop): Prefer (X && !Y) to (X ? !Y : 0).
(get_overlay_strings): Omit unnecessary casts.
(forward_to_next_line_start):
(Ftool_bar_height):
Prefer !BOOL to (BOOL ? 0 : 1).
(next_element_function): New typedef.
(get_next_element): Use it.  Now const.
(IT_POS_VALID_AFTER_MOVE_P): Prefer !X || Y==0 to (X ? Y==0 : 1).
(vmessage): Now ATTRIBUTE_FORMAT_PRINTF (1, 0), to pacify GCC 4.9.2
(display_echo_area): Prefer BOOLEXPR to BOOLEXPR ? 1 : 0.
(tool_bar_item_info): Simplify.
(invisible_prop): Rename from invisible_p, since it doesn't
return bool.  All callers changed.
(x_produce_glyphs): Simplify.

shr cleanup and background color fix

(shr-table-widths): Off-by-one error in width computation.
(shr-expand-newlines): Remove dead code.
(shr-insert-table): Extend background colors to the end of the column.

(shr-tag-hr): Compute the right length when using fonts.

Fix <h1> and <tt> rendering

(shr-tag-h1): Don't use variable-pitch fonts on fontless rendering.
(shr-tag-tt): New function.

Mention the shr font changes

* doc/misc/eww.texi (Basics): Mention eww-toggle-fonts.

Allow using variable-width fonts in eww

* lisp/gnus/mm-decode.el (mm-shr): Only pass the fill column when not using
fonts, because limiting the width to what's appropriate for followups
doesn't really help when not using proportional fonts.

* lisp/net/shr.el (shr-use-fonts): New variable.
(shr-fill-text): Rename from "fold".
(shr-pixel-column, shr-pixel-region, shr-string-pixel-width): New
functions.
(shr-insert): Just insert, don't fill the text.  Filling is now
done afterwards per display unit.
(shr-fill-lines, shr-fill-line): New functions to fill text on a
per-unit base.
(shr-find-fill-point): Take a "beginning" parameter.
(shr-indent): Indent using the :width display parameter when using
fonts.
(shr-parse-style): Ignore "inherit" values, since we already do that.
(shr-tag-img): Remove the insertion states.
(shr-tag-blockquote): New-style filling.
(shr-tag-dd): Ditto.
(shr-tag-li): Ditto.
(shr-mark-fill): New function to mark lines that need filling.
(shr-tag-h1): Use a larger font.
(shr-tag-table-1): Get the natural and suggested widths in one
rendering.
(shr-tag-table): Create the "fixed" version of the table only once
so that we can cache data in the table.
(shr-insert-table): Get colspan calculations right by having
zero-width columns after colspan ones.
(shr-expand-alignments): New function to make :align-to specs work
right when rendered in one buffer and displayed in another one.
(shr-insert-table-ruler): Use :align-to to get the widths right.
(shr-make-table): Cache more.
(shr-make-table-1): Use the new <td> data layout.
(shr-pixel-buffer-width): New function.
(shr-render-td): Add a caching layer.
(shr-dom-max-natural-width): New function.

python.el: Fix typo in eldoc initialization for Emacs 24.x

python.el: Improved shell font lock respecting markers.

Fixes: debbugs:19650
* lisp/progmodes/python.el
(python-shell-font-lock-get-or-create-buffer): Use special buffer name.
(python-shell-font-lock-with-font-lock-buffer): Enable font lock.
(python-shell-font-lock-post-command-hook): Fontify by copying text
properties from fontified buffer to shell, keeping markers unchanged.
(python-shell-font-lock-turn-off): Fix typo.
(python-util-text-properties-replace-name): Delete function.

Check for some overflows in vertical-motion

* indent.c (window_column_x): New function.
(Fvertical_motion): Use it to protect against integer overflow
when computing column.  Prefer extract_float to doing things by hand.
Avoid unnecessary casts.

* xfont.c: Minor style fixes

(xfont_list_pattern): Reindent to 80 cols and use Emacs-style comments.
Redo loop so that less indentation is needed.

Fixes: debbugs:19820
* etc/NEWS.24: Fix typo

Fixes: debbugs:19815
* lisp/textmodes/css-mode.el (css-smie-rules): Fix paren indent.

Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

Speed up vertical-motion when screen coordinates are known

 src/indent.c (Fvertical_motion): Accept an additional argument
 CUR-COL and use it as the starting screen coordinate.
 src/window.c (window_scroll_line_based, Fmove_to_window_line): All
 callers of vertical-motion changed.

 doc/lispref/positions.texi (Screen Lines): Update the documentation of
 vertical-motion to document the new additional argument.

* lisp/emacs-lisp/cl-generic.el (cl--generic-lambda): Use macroexp-parse-body.

* lisp/emacs-lisp/eieio-core.el (eieio-oset-default): Catch the unexpected

case where the default value would be re-interpreted as a form!

Remove unused assignment.

* font.c (font_score): Remove unused variable assignment.

Try non-scaled xld fonts first, and scaled if that failed.

Fixes: debbugs:19117
* xfaces.c (realize_basic_faces): Don't set Qscalable_fonts_allowed to
t.
* font.c (font_score): Try to find a font without scaling first,
and only accept scalable fonts if we did not get a match.

* src/keyboard.c (syms_of_keyboard): Use non-nil default value.

* lisp/help-fns.el (help-fns--signature): Keep doc for keymap.

desktop.el: Save mark-ring less verbosely.

For the discussion, see
https://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00582.html

Use C99's INFINITY and NAN macros

* lread.c: Include <math.h>.
(string_to_number): Use INFINITY and NAN rather than rolling our own.
This avoids some runtime diagnostics when building with
gcc -fsanitize=undefined.

Fix bidi_explicit_dir_char undefined behavior

* bidi.c (bidi_explicit_dir_char): Avoid subscript error when
argument is BIDI_EOB.  This can happen in bidi_level_of_next_char.

Add macro pcase-lambda

Fixes: debbugs:19814
* emacs-lisp/lisp-mode.el (el-kws-re): Include `pcase-lambda'.

* emacs-lisp/macroexp.el (macroexp-parse-body): New function.

* emacs-lisp/pcase.el (pcase-lambda): New Macro.

Better distinguish infinite from invalid times

* editfns.c (check_time_validity): New function.
(decode_time_components): Return int, not bool.
Return -1 (not 0) if the time is out of range.
All callers changed.
(lisp_time_struct, lisp_seconds_argument): Distinguish better
between time overflow and invalid time values.

* configure.ac (HAVE_LIBXML2): Add missing comma.

Port to platforms lacking test -a and -o

* configure.ac (HAVE_LIBXML2):
* lisp/Makefile.in (compile-clean):
* lisp/net/tramp-sh.el (tramp-find-executable):
Prefer '&&' and '||' to 'test -a' and 'test -o'.

newcomment.el (comment-line): Fix missing paren.

configure --with-gameuser now defaults to games group.

* configure.ac (--with-gameuser): Default to 'games' group instead
of 'games' user.
* lisp/play/gamegrid.el: Update comment to reflect that the
'update-game-score' helper program is now setgid by default.

subr.el (apply-partially): Use lexical binding.

Fixes: debbugs:19785
See
<URL:http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00784.html>
for discussion.

NEWS: Document `comment-line'.

newcomment.el (comment-line): New command on C-x C-;.

Minor tweaks to frame_size_history_add

* frame.c (frame_size_history_add): Don't assume length fits in 'int'.
Prefer XCAR and XCDR to Fcar and Fcdr when the arg is a cons.
(Fframe_after_make_frame): Simplify.
* gtkutil.c: Remove commented-out code.
* xfns.c (Fx_create_frame): Fix indenting.

Fix a thinko in frame-parameter  (Bug#19802)

 src/frame.c (Fframe_parameter): Don't replace a non-nil value of
 foreground-color or background-color parameters with a nil value.

lisp/outline.el (outline-show-entry): Fix one invisible char

* lisp/outline.el (outline-show-entry): Previously, when called for
the last outline in a file, a single invisible char was left.
Add a check for this condition.

* src/data.c (Findirect_function): Don't signal an error

* src/data.c (Findirect_function): Like `symbol-function', don't signal an
error for void functions any more.
* lisp/subr.el (indirect-function): Change advertised calling convention.

python.el: Fix completion-at-point.

Fixes: debbugs:19667
* lisp/progmodes/python.el
(python-shell-completion-native-get-completions): Force process
buffer.
(python-shell-completion-at-point): Handle case where call is not
in a shell buffer.

python.el: Fix shell font-lock multiline input.

Fixes: debbugs:19744
* lisp/progmodes/python.el
(python-shell-font-lock-post-command-hook): Handle multiline
input.

python.el: Make shell font-lock respect markers.

Fixes: debbugs:19650
* lisp/progmodes/python.el (python-shell-font-lock-cleanup-buffer): Use
`erase-buffer`.
(python-shell-font-lock-comint-output-filter-function): Handle
newlines.
(python-shell-font-lock-post-command-hook): Respect markers on
text fontification.

Fix attribution in previous commit

python.el: Keep eldoc visible while typing args.

Fixes: debbugs:19637
* lisp/progmodes/python.el (python-eldoc--get-symbol-at-point): New
function.
(python-eldoc--get-doc-at-point, python-eldoc-at-point): Use it.

* test/automated/python-tests.el
(python-eldoc--get-symbol-at-point-1)
(python-eldoc--get-symbol-at-point-2)
(python-eldoc--get-symbol-at-point-3)
(python-eldoc--get-symbol-at-point-4): New tests.

Fix hideshow integration.

Fixes: debbugs:19761
* lisp/progmodes/python.el
(python-hideshow-forward-sexp-function): New function based on
Carlos Pita <carlosjosepita@gmail.com> patch.
(python-mode): Make `hs-special-modes-alist` use it and initialize
the end regexp with the empty string to avoid skipping parens.

* test/automated/python-tests.el
(python-tests-visible-string): New function.
(python-parens-electric-indent-1)
(python-triple-quote-pairing): Fix indentation, move require calls.
(python-hideshow-hide-levels-1)
(python-hideshow-hide-levels-2): New tests.

* lisp/progmodes/python.el (python-check-custom-command): Do not use
defvar-local for compat with Emacs<24.3.

Try to improve handling of fullwidth/-height frames.

* frame.el (frame-notice-user-settings): Update
`frame-size-history'.
(make-frame): Update `frame-size-history'.  Call
`frame-after-make-frame'.
* faces.el (face-set-after-frame-default): Remove call to
frame-can-run-window-configuration-change-hook.
* frame.c (frame_size_history_add): New function.
(frame_inhibit_resize): Consider frame_inhibit_implied_resize
only after frame's after_make_frame slot is true.  Inhibit
resizing fullwidth-/height frames in one direction only.  Update
frame_size_history.
(adjust_frame_size): Call frame_size_history_add.
(make_frame): Initalize after_make_frame slot.
(Fmake_terminal_frame): Adjust adjust_frame_size call.
(Fcan_run_window_configuration_change_hook): Rename to
Fframe_after_make_frame.  Set after_make_frame slot.  Return
second argument.
(x_set_frame_parameters): Postpone handling fullscreen parameter
until after width and height parameters have been set.  Apply
width and height changes only if can_x_set_window_size is true.
Update frame_size_history.
(Qadjust_frame_size_1, Qadjust_frame_size_2)
(Qadjust_frame_size_3, QEmacsFrameResize, Qframe_inhibit_resize)
(Qx_set_fullscreen, Qx_check_fullscreen, Qx_set_window_size_1)
(Qxg_frame_resized, Qxg_frame_set_char_size_1)
(Qxg_frame_set_char_size_2, Qxg_frame_set_char_size_3)
(Qxg_change_toolbar_position, Qx_net_wm_state)
(Qx_handle_net_wm_state, Qtb_size_cb, Qupdate_frame_tool_bar)
(Qfree_frame_tool_bar): New symbol for updating
frame_size_history.
(Qtip_frame, Qterminal_frame): New symbols.
(Vframe_adjust_size_history): Rename to frame_size_history.
* frame.h (struct frame): Rename
can_run_window_configuration_change_hook slot to
after_make_frame.
(frame_size_history_add): Extern.
* gtkutil.c (xg_frame_resized): Call frame_size_history_add.
Don't set FRAME_PIXEL_WIDTH and FRAME_PIXEL_HEIGHT here.
(xg_frame_set_char_size): Try to preserve the status of
fullwidth/-height frames.  Call frame_size_history_add.
(tb_size_cb, update_frame_tool_bar, free_frame_tool_bar)
(xg_change_toolbar_position): Call frame_size_history_add.
* w32fns.c (x_change_tool_bar_height): Handle frame's fullscreen
status.
(Fx_create_frame): Process fullscreen parameter after frame has
been resized.
(x_create_tip_frame): Pass Qtip_frame to adjust_frame_size.
(Fx_frame_geometry): Don't pollute pure storage.
* w32term.c (w32_read_socket): For WM_WINDOWPOSCHANGED,
WM_ACTIVATE and WM_ACTIVATEAPP set frame's visibility before
calling w32fullscreen_hook.  For WM_DISPLAYCHANGE call
w32fullscreen_hook immediately.
(x_fullscreen_adjust, x_check_fullscreen): Remove.
(w32fullscreen_hook): Call change_frame_size just as with a
"normal" frame resize operation.  Call do_pending_window_change.
(x_set_window_size): Try to handle fullwidth and fullheight more
accurately.  Don't rely on w32_enable_frame_resize_hack.
(w32_enable_frame_resize_hack): Remove variable.
* widget.c (EmacsFrameResize): Remove dead code.  Call
frame_size_history_add
* window.c (run_window_configuration_change_hook): Check
f->after_make_frame instead of
f->can_run_window_configuration_change_hook.
* xfns.c (x_change_tool_bar_height): Handle frame's fullscreen status.
(Fx_create_frame): Process fullscreen parameter after frame has
been resized.
(Fx_frame_geometry): Don't pollute pure storage.
* xterm.c (x_net_wm_state, x_handle_net_wm_state): Call
frame_size_history_add.
(do_ewmh_fullscreen): Handle x_frame_normalize_before_maximize.
(x_check_fullscreen): Count in menubar when calling
XResizeWindow.  Wait for ConfigureNotify event.  Call
frame_size_history_add.
(x_set_window_size_1): Remove PIXELWISE argument.  Try to handle
changing a fullheight frame's width or a fullwidth frame's
height.  Call frame_size_history_add.
(x_set_window_size): Simplify xg_frame_set_char_size and
x_set_window_size_1 calls.
(x_frame_normalize_before_maximize): New variable.

Remove no-longer-used cursor_in_echo_area code

* dispnew.c (set_window_cursor_after_update, update_frame_1):
Remove checks for negative cursor_in_echo_area, since this var is
a boolean, and has been a boolean for some time.  Simplify.
* dispnew.c (init_display):
* xdisp.c (message3_nolog, vmessage): Use bool for boolean.

Make vc-test-svn03-working-revision pass

* test/automated/vc-tests.el (vc-test--working-revision): Fix
`vc-working-revision' checks to be compared against nil, which is
what is should return for unregistered files.

(vc-cvs-dir-status-files): Don't pass DIR to `vc-cvs-command'

Fixes: debbugs:19732
* lisp/vc/vc-cvs.el (vc-cvs-dir-status-files): Don't pass DIR to
`vc-cvs-command'.

Add documentation for seq-mapcat, seq-partition and seq-group-by

* doc/lispref/sequences.texi (Sequence Functions): Add documentation
for seq-mapcat, seq-partition and seq-group-by

Better docstring for seq.el functions

* lisp/emacs-lisp/seq.el: Better docstring for seq.el functions

Add seq-partition and seq-group-by

* lisp/emacs-lisp/seq.el: Better docstring for seq.el functions
* test/automated/seq-tests.el: New tests for seq-partition and
  seq-group-by

Add seq-mapcat

* lisp/emacs-lisp/seq.el (seq-mapcat): New function
* test/automated/seq-tests.el: Add unit tests for seq-mapcat

doc-view.el (doc-view-kill-proc-and-buffer): Obsolete.

Use image-kill-buffer instead.
(doc-view-mode): Add `doc-view-kill-proc' to `kill-buffer-hook'.

image-mode.el (image-kill-buffer): New command bound to k.

net/ldap.el (ldap-search-internal): Fix docstring

Fix json error-definition condition build error

* lisp/subr.el (define-error): The error conditions may be constant
lists, so use `append' to concatenate them.

Respect the :end-of-capability setting

* lisp/net/network-stream.el (network-stream-open-tls): Respect the
:end-of-capability setting.

emacs-lisp/package.el: Add missing (require 'subr-x)

emacs-lisp/package.el (package-delete): Don't always delesect.

emacs-lisp/package.el (package-menu-mark-install): Mark dependency.

automated/package-test.el (package-test-sort-by-dependence): New test

automated/package-test.el (package-test-get-deps): Fix typo.

emacs-lisp/package.el (package-menu-execute): Delete packages in order.

* lisp/textmodes/css-mode.el: Handle hyphenated vars

Fixes: debbugs:19263
* lisp/textmodes/css-mode.el (scss-smie--not-interpolation-p): Vars can be
hyphenated.

* lisp/textmodes/css-mode.el: Handle variable interpolation

Fixes: debbugs:19751
* lisp/textmodes/css-mode.el (css-fill-paragraph): Fix filling in presence
of variable interpolation.