bug#18970: 24.3; indent region fails in C++ mode after adding a #include

[Piotr Sipika <piotr.sipika@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 901 bytes --]

Alan, here's another instance of the problem:

> The steps were:
> 1. Edited a C++ header file in a buffer.
The file is attached (libxmlparser.h).
I've had it open in a buffer for a while and have edited it successfully
(without the indentation problem) within the current emacs session.
I just switched to it from another buffer.

> 4. Added a #include to the top of the buffer.
4.1 I added a newline on line 8.
4.2 I then added another #include (pasted using C-y): #include
<libxml/xpath.h>
4.3 I then added another newline under the new #include.

> 5. Indentation for all code blocks following the include, when using
Tested line 14 (of the updated file) with a [TAB] and noticed the
forward declaration got moved to column 0.

When I undo all changes (steps 4.3 to 4.1), indentation is OK (remains
at respective column). When I repeat the steps, indentation gets moved
to column 0.

Best!
Piotr


[-- Attachment #2: libxmlparser.h --]
[-- Type: text/plain, Size: 942 bytes --]


#ifndef LXWEATHER_LIBXMLPARSER_H_
#define LXWEATHER_LIBXMLPARSER_H_

#include "parser.h"

#include <pthread.h>

namespace LXWeather
{
  /* forward declarations */
  class Location;
  class Forecast;

  class LibXMLParser : public Parser
  {
  public:
    LibXMLParser(pthread_mutex_t *mutex);

    virtual ~LibXMLParser();

    virtual std::vector<Location *> parseLocationList(const std::string &data);
    virtual void parseForecast(const std::string &data, Forecast *forecast);
    
  protected:
    class XPATHWrapper
    {
    public:
      XPATHWrapper() : pContext_(NULL)
        {
          xmlXPathInit();
        }

      ~NanoHTTPWrapper()
        {
          xmlNanoHTTPClose(pContext_);
        }

      std::string get(const std::string &URI, int *retcode);
      
    private:
      void *pContext_;
    };

  private:
    pthread_mutex_t *mutex_;
  };

} /* end namespace LXWeather */

#endif /* LXWEATHER_LIBXMLPARSER_H_ */